Skip to content

Commit 8aaf8bb

Browse files
authored
build: api, golang (#187)
1 parent 3f5f14a commit 8aaf8bb

File tree

15 files changed

+191
-169
lines changed

15 files changed

+191
-169
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
env:
1818
# UPDATE_HERE
1919
# https://hub.docker.com/r/rancher/k3s/tags
20-
K3S_VERSION: v1.30.2-k3s2
20+
K3S_VERSION: v1.30.3-k3s1
2121
# https://github.com/helm-unittest/helm-unittest/releases
22-
HELM_UNITTEST_VERSION: 0.5.1
22+
HELM_UNITTEST_VERSION: 0.5.2
2323

2424
steps:
2525

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repos:
33
- repo: https://github.com/norwoodj/helm-docs
44
# https://github.com/norwoodj/helm-docs/releases
5-
rev: v1.13.1
5+
rev: v1.14.2
66
hooks:
77
- id: helm-docs
88
args:

.tool-versions

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# UPDATE_HERE
22
# https://github.com/kubernetes-sigs/kubebuilder/releases
3-
kubebuilder 4.1.0
3+
kubebuilder 4.1.1
44
# https://golang.org/dl/
5-
golang 1.22.5
5+
golang 1.22.6
66
# https://github.com/mozilla/sops/releases
77
sops 3.9.0
88
# https://github.com/kubernetes-sigs/kustomize/releases
9-
kustomize 5.4.2
9+
kustomize 5.4.3
1010
# https://github.com/rancher/k3d/releases
11-
k3d 5.7.1
11+
k3d 5.7.3
1212
# https://github.com/kubernetes/kubernetes/releases
13-
kubectl 1.30.2
13+
kubectl 1.30.3
1414
# https://github.com/helm/helm/releases
15-
helm 3.15.2
15+
helm 3.15.3
1616
# https://github.com/norwoodj/helm-docs/releases
17-
helm-docs 1.13.1
17+
helm-docs 1.14.2
1818
# https://github.com/yannh/kubeconform/releases
19-
kubeconform 0.6.6
19+
kubeconform 0.6.7
2020
# https://github.com/git-chglog/git-chglog/releases
2121
git-chglog 0.15.4
2222
# https://github.com/golangci/golangci-lint/releases
2323
golangci-lint 1.59.1
2424
# https://github.com/cli/cli/releases
25-
github-cli 2.52.0
25+
github-cli 2.54.0

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# UPDATE_HERE
22
# !!!!!!! NOTE: GOEXPERIMENT=nocoverageredesign is temp until 1.23.x
33
GO := GOEXPERIMENT=nocoverageredesign GOPROXY=https://proxy.golang.org go
4-
SOPS_SEC_OPERATOR_VERSION := 0.13.2
4+
SOPS_SEC_OPERATOR_VERSION := 0.13.3
55

66
# https://github.com/kubernetes-sigs/controller-tools/releases
77
CONTROLLER_GEN_VERSION := "v0.15.0"
88
# https://github.com/kubernetes-sigs/controller-runtime/releases
99
CONTROLLER_RUNTIME_VERSION := "v0.18.4"
1010
# https://github.com/kubernetes-sigs/kustomize/releases
11-
KUSTOMIZE_VERSION := "v5.4.2"
11+
KUSTOMIZE_VERSION := "v5.4.3"
1212
# use `setup-envtest list` to obtain the list of available versions
1313
# until fixed, can't use newer version, see:
1414
# https://github.com/kubernetes-sigs/controller-runtime/issues/1571

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ encrypted files stored in `git` repository.
2323

2424
| Kubernetes | Sops | Chart | Operator |
2525
|---|---|---|---|
26-
| v1.30.x | v3.9.0 | 0.19.3 | 0.13.2 |
26+
| v1.30.x | v3.9.0 | 0.19.4 | 0.13.3 |
2727
| v1.29.x | v3.8.1 | 0.18.6 | 0.12.6 |
2828
| v1.28.x | v3.8.1 | 0.17.4 | 0.11.4 |
2929
| v1.27.x | v3.7.3 | 0.15.5 | 0.9.5 |

chart/helm3/sops-secrets-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
# UPDATE_HERE
3-
version: 0.19.3
4-
appVersion: 0.13.2
3+
version: 0.19.4
4+
appVersion: 0.13.3
55
type: application
66
description: Helm chart deploys sops-secrets-operator
77
name: sops-secrets-operator

chart/helm3/sops-secrets-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CHART_NAME?=$(shell cat Chart.yaml | awk 'BEGIN { FS=": " } $$0~/^name:/ { gsub(
44
VERSION_TAG?=$(shell cat Chart.yaml | awk 'BEGIN { FS=": " } $$0~/^version/ { gsub(/['\'',]/, ""); print $$2; }')
55

66
# UPDATE_HERE
7-
K8S_VERSION := "1.30.2"
7+
K8S_VERSION := "1.30.3"
88

99
SHELL=/bin/bash
1010

chart/helm3/sops-secrets-operator/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The following table lists the configurable parameters of the Sops-secrets-operat
134134
| healthProbes.readiness | object | `{"initialDelaySeconds":5,"periodSeconds":10}` | Readiness probe configuration |
135135
| image.pullPolicy | string | `"Always"` | Operator image pull policy |
136136
| image.repository | string | `"isindir/sops-secrets-operator"` | Operator image name |
137-
| image.tag | string | `"0.13.2"` | Operator image tag |
137+
| image.tag | string | `"0.13.3"` | Operator image tag |
138138
| imagePullSecrets | list | `[]` | Secrets to pull image from private docker repository |
139139
| initImage.pullPolicy | string | `"Always"` | Init container image pull policy |
140140
| initImage.repository | string | `"ubuntu"` | Init container image name |
@@ -146,6 +146,7 @@ The following table lists the configurable parameters of the Sops-secrets-operat
146146
| logging.level | string | `"info"` | Zap Level to configure the verbosity of logging. Can be one of 'debug', 'info', 'error', or any integer value > 0 which corresponds to custom debug levels of increasing verbosity |
147147
| logging.stacktraceLevel | string | `"error"` | Zap Level at and above which stacktraces are captured (one of 'info', 'error'). |
148148
| logging.timeEncoding | string | `"iso8601"` | Zap time encoding (one of 'epoch', 'millis', 'nano', 'iso8601', 'rfc3339' or 'rfc3339nano'). Defaults to 'epoch'. |
149+
| metrics.additionalLabels | object | `{}` | Additional labels for ServiceMonitor |
149150
| metrics.enabled | bool | `false` | Enable prometheus metrics |
150151
| nameOverride | string | `""` | Overrides auto-generated short resource name |
151152
| namespaced | bool | `false` | If set - operator will watch SopsSecret resources only in operator namespace |

chart/helm3/sops-secrets-operator/tests/monitor_test.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@ tests:
5050
of: monitoring.coreos.com/v1
5151
- equal:
5252
path: metadata.labels
53+
# UPDATE_HERE
5354
value:
5455
app.kubernetes.io/instance: sops
5556
app.kubernetes.io/managed-by: Helm
5657
app.kubernetes.io/name: sops-secrets-operator
57-
app.kubernetes.io/version: "0.13.2"
58-
helm.sh/chart: sops-secrets-operator-0.19.3
59-
custom-label: custom-value
58+
app.kubernetes.io/version: "0.13.3"
59+
helm.sh/chart: sops-secrets-operator-0.19.4
60+
custom-label: custom-value

chart/helm3/sops-secrets-operator/tests/operator_test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ tests:
3030
app.kubernetes.io/instance: sops
3131
app.kubernetes.io/managed-by: Helm
3232
app.kubernetes.io/name: sops-secrets-operator
33-
app.kubernetes.io/version: 0.13.2
34-
helm.sh/chart: sops-secrets-operator-0.19.3
33+
app.kubernetes.io/version: 0.13.3
34+
helm.sh/chart: sops-secrets-operator-0.19.4
3535

3636
# custom name
3737
- it: should correctly render custome name
@@ -169,7 +169,7 @@ tests:
169169
# UPDATE_HERE
170170
- equal:
171171
path: spec.template.spec.containers[0].image
172-
value: isindir/sops-secrets-operator:0.13.2
172+
value: isindir/sops-secrets-operator:0.13.3
173173
- equal:
174174
path: spec.template.spec.containers[0].imagePullPolicy
175175
value: Always

0 commit comments

Comments
 (0)