Skip to content

Commit 61a0112

Browse files
authored
fix: use predicates instead of checking status, update deps (#201)
* fix: use predicates instead of checking status, update deps * add GC for orphaned secrets, while originally owning sops object exists
1 parent 0507347 commit 61a0112

File tree

19 files changed

+311
-209
lines changed

19 files changed

+311
-209
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.31.5-k3s1
20+
K3S_VERSION: v1.32.2-k3s1
2121
# https://github.com/helm-unittest/helm-unittest/releases
22-
HELM_UNITTEST_VERSION: 0.7.2
22+
HELM_UNITTEST_VERSION: 0.8.0
2323

2424
steps:
2525

.tool-versions

Lines changed: 7 additions & 7 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.5.0
3+
kubebuilder 4.5.1
44
# https://golang.org/dl/
5-
golang 1.23.6
5+
golang 1.24.1
66
# https://github.com/mozilla/sops/releases
77
sops 3.9.4
88
# https://github.com/kubernetes-sigs/kustomize/releases
99
kustomize 5.6.0
1010
# https://github.com/rancher/k3d/releases
11-
k3d 5.8.1
11+
k3d 5.8.3
1212
# https://github.com/kubernetes/kubernetes/releases
13-
kubectl 1.31.5
13+
kubectl 1.32.3
1414
# https://github.com/helm/helm/releases
15-
helm 3.17.0
15+
helm 3.17.2
1616
# https://github.com/norwoodj/helm-docs/releases
1717
helm-docs 1.14.2
1818
# https://github.com/yannh/kubeconform/releases
1919
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
23-
golangci-lint 1.63.4
23+
golangci-lint 1.64.8
2424
# https://github.com/cli/cli/releases
25-
github-cli 2.66.1
25+
github-cli 2.69.0

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
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.14.3
4+
SOPS_SEC_OPERATOR_VERSION := 0.15.0
55

66
# https://github.com/kubernetes-sigs/controller-tools/releases
7-
CONTROLLER_GEN_VERSION := "v0.17.1"
7+
CONTROLLER_GEN_VERSION := "v0.17.2"
88
# https://github.com/kubernetes-sigs/controller-runtime/releases
9-
CONTROLLER_RUNTIME_VERSION := "v0.20.1"
9+
CONTROLLER_RUNTIME_VERSION := "v0.20.3"
1010
# https://github.com/kubernetes-sigs/kustomize/releases
1111
KUSTOMIZE_VERSION := "v5.6.0"
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
1515
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
1616
# https://storage.googleapis.com/kubebuilder-tools
17-
ENVTEST_K8S_VERSION := "1.30.0"
17+
ENVTEST_K8S_VERSION := "1.30.2"
1818

1919
# Use existing cluster instead of starting processes
2020
USE_EXISTING_CLUSTER ?= true

README.md

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

2424
| Kubernetes | Sops | Chart | Operator |
2525
|---|---|---|---|
26+
| v1.32.x | v3.9.4 | 0.21.0 | 0.15.0 |
2627
| v1.31.x | v3.9.4 | 0.20.5 | 0.14.3 |
2728
| v1.30.x | v3.9.0 | 0.19.4 | 0.13.3 |
2829
| v1.29.x | v3.8.1 | 0.18.6 | 0.12.6 |

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.20.5
4-
appVersion: 0.14.3
3+
version: 0.21.0
4+
appVersion: 0.15.0
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.31.5"
7+
K8S_VERSION := "1.32.3"
88

99
SHELL=/bin/bash
1010

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

Lines changed: 1 addition & 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.14.3"` | Operator image tag |
137+
| image.tag | string | `"0.15.0"` | 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 |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ tests:
5555
app.kubernetes.io/instance: sops
5656
app.kubernetes.io/managed-by: Helm
5757
app.kubernetes.io/name: sops-secrets-operator
58-
app.kubernetes.io/version: "0.14.3"
59-
helm.sh/chart: sops-secrets-operator-0.20.5
58+
app.kubernetes.io/version: "0.15.0"
59+
helm.sh/chart: sops-secrets-operator-0.21.0
6060
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.14.3
34-
helm.sh/chart: sops-secrets-operator-0.20.5
33+
app.kubernetes.io/version: 0.15.0
34+
helm.sh/chart: sops-secrets-operator-0.21.0
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.14.3
172+
value: isindir/sops-secrets-operator:0.15.0
173173
- equal:
174174
path: spec.template.spec.containers[0].imagePullPolicy
175175
value: Always

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

Lines changed: 2 additions & 2 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.14.3
34-
helm.sh/chart: sops-secrets-operator-0.20.5
33+
app.kubernetes.io/version: 0.15.0
34+
helm.sh/chart: sops-secrets-operator-0.21.0
3535

3636
# custom name
3737
- it: should correctly render custome service account name

0 commit comments

Comments
 (0)