Skip to content

Commit bcdec94

Browse files
isindirjosh
andauthored
up: k8s api, controller runtime, kubernetes, sops (#243)
* up: k8s api, controller runtime, kubernetes Update kubernetes to 1.36, k8s api to 0.36.1, controller-runtime to 0.24.1 * up: k8s api, controller runtime, kubernetes, sops --------- Co-authored-by: Joshua Peek <josh@users.noreply.github.com>
1 parent edf21ef commit bcdec94

17 files changed

Lines changed: 334 additions & 295 deletions

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
env:
1717
# UPDATE_HERE
1818
# https://hub.docker.com/r/rancher/k3s/tags
19-
K3S_VERSION: v1.35.3-k3s1
19+
K3S_VERSION: v1.36.0-k3s1
2020
# https://github.com/helm-unittest/helm-unittest/releases
21-
HELM_UNITTEST_VERSION: 1.0.3
21+
HELM_UNITTEST_VERSION: 1.1.0
2222

2323
steps:
2424
# UPDATE_HERE
@@ -32,7 +32,7 @@ jobs:
3232
uses: asdf-vm/actions/install@v4
3333
with:
3434
# https://github.com/asdf-vm/asdf/releases
35-
asdf_version: 0.18.1
35+
asdf_version: 0.19.0
3636

3737
- name: install gpg2
3838
run: |

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: asdf-vm/actions/install@v4
4848
with:
4949
# https://github.com/asdf-vm/asdf/releases
50-
asdf_version: 0.18.1
50+
asdf_version: 0.19.0
5151

5252
# UPDATE_HERE
5353
# https://github.com/docker/setup-qemu-action/releases

.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.13.1
3+
kubebuilder 4.14.0
44
# https://golang.org/dl/
5-
golang 1.26.2
5+
golang 1.26.3
66
# https://github.com/mozilla/sops/releases
7-
sops 3.12.2
7+
sops 3.13.0
88
# https://github.com/kubernetes-sigs/kustomize/releases
99
kustomize 5.8.1
1010
# https://github.com/rancher/k3d/releases
1111
k3d 5.8.3
1212
# https://github.com/kubernetes/kubernetes/releases
13-
kubectl 1.35.4
13+
kubectl 1.36.1
1414
# https://github.com/helm/helm/releases
15-
helm 4.1.4
15+
helm 4.2.0
1616
# https://github.com/norwoodj/helm-docs/releases
1717
helm-docs 1.14.2
1818
# https://github.com/yannh/kubeconform/releases
1919
kubeconform 0.7.0
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 2.11.4
23+
golangci-lint 2.12.2
2424
# https://github.com/cli/cli/releases
25-
github-cli 2.90.0
25+
github-cli 2.92.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FROM public.ecr.aws/ubuntu/ubuntu:26.04 AS install-asdf
99

1010
# UPDATE_HERE
1111
# https://github.com/asdf-vm/asdf/releases
12-
ARG ASDF_VERSION=v0.18.1
12+
ARG ASDF_VERSION=v0.19.0
1313

1414
# hadolint ignore=DL3008
1515
RUN apt-get -y update \

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# UPDATE_HERE
22
GO := GOPROXY=https://proxy.golang.org go
3-
SOPS_SEC_OPERATOR_VERSION := 0.20.2
3+
SOPS_SEC_OPERATOR_VERSION := 0.21.0
44

55
# https://github.com/kubernetes-sigs/controller-tools/releases
6-
CONTROLLER_GEN_VERSION := "v0.20.1"
6+
CONTROLLER_GEN_VERSION := "v0.21.0"
77
# https://github.com/kubernetes-sigs/controller-runtime/releases
8-
CONTROLLER_RUNTIME_VERSION := "v0.23.3"
8+
CONTROLLER_RUNTIME_VERSION := "v0.24.1"
99
# https://github.com/kubernetes-sigs/kustomize/releases
1010
KUSTOMIZE_VERSION := "v5.8.1"
1111
# use `setup-envtest list` to obtain the list of available versions
1212
# until fixed, can't use newer version, see:
1313
# https://github.com/kubernetes-sigs/controller-runtime/issues/1571
1414
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
1515
# https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/master/envtest-releases.yaml
16-
ENVTEST_K8S_VERSION := "1.35.0"
16+
ENVTEST_K8S_VERSION := "1.36.0"
1717

1818
# Use existing cluster instead of starting processes
1919
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.36.x | v3.13.0 | 0.27.0 | 0.21.0 |
2627
| v1.35.x | v3.12.2 | 0.26.0 | 0.20.2 |
2728
| v1.35.x | v3.12.2 | 0.25.4 | 0.20.1 |
2829
| v1.34.x | v3.11.0 | 0.24.1 | 0.17.3 |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
# UPDATE_HERE
3-
version: 0.26.0
4-
kubeVersion: ">= 1.34.0 < 1.36.0"
5-
appVersion: 0.20.2
3+
version: 0.27.0
4+
kubeVersion: ">= 1.35.0 < 1.37.0"
5+
appVersion: 0.21.0
66
type: application
77
description: Helm chart deploys sops-secrets-operator
88
name: sops-secrets-operator

chart/helm4/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.35.4"
7+
K8S_VERSION := "1.36.1"
88

99
SHELL=/bin/bash
1010

chart/helm4/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.20.2"
59-
helm.sh/chart: sops-secrets-operator-0.26.0
58+
app.kubernetes.io/version: "0.21.0"
59+
helm.sh/chart: sops-secrets-operator-0.27.0
6060
custom-label: custom-value

chart/helm4/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.20.2
34-
helm.sh/chart: sops-secrets-operator-0.26.0
33+
app.kubernetes.io/version: 0.21.0
34+
helm.sh/chart: sops-secrets-operator-0.27.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: quay.io/isindir/sops-secrets-operator:0.20.2
172+
value: quay.io/isindir/sops-secrets-operator:0.21.0
173173
- equal:
174174
path: spec.template.spec.containers[0].imagePullPolicy
175175
value: Always

0 commit comments

Comments
 (0)