Skip to content

Commit 6a1e88e

Browse files
authored
up: golang, k8s api, controller runtime (#205)
* up: golang, k8s api, controller runtime * add new alternative reference; add better list of available envtest references * Fix typo
1 parent 4b965e4 commit 6a1e88e

File tree

20 files changed

+298
-262
lines changed

20 files changed

+298
-262
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ jobs:
1717
env:
1818
# UPDATE_HERE
1919
# https://hub.docker.com/r/rancher/k3s/tags
20-
K3S_VERSION: v1.33.0-k3s1
20+
K3S_VERSION: v1.33.4-k3s1
2121
# https://github.com/helm-unittest/helm-unittest/releases
22-
HELM_UNITTEST_VERSION: 0.8.2
22+
HELM_UNITTEST_VERSION: 1.0.0
2323

2424
steps:
2525

2626
# UPDATE_HERE
2727
# https://github.com/actions/checkout/releases
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
name: Check out code
3030

3131
# UPDATE_HERE
3232
# https://github.com/asdf-vm/actions/releases
3333
# https://github.com/asdf-vm/actions/issues/594
3434
- name: Install asdf tools
35-
# uses: asdf-vm/actions/install@v3
36-
uses: asdf-vm/actions/install@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
35+
# uses: asdf-vm/actions/install@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
36+
uses: asdf-vm/actions/install@v4
3737
with:
38-
asdf_version: 0.16.7
38+
asdf_version: 0.18.0
3939

4040
- name: install gpg2
4141
run: |

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
# UPDATE_HERE
2020
# https://github.com/actions/checkout/releases
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
name: Check out code
2323
with:
2424
fetch-tags: 'true'
@@ -45,10 +45,10 @@ jobs:
4545
# https://github.com/asdf-vm/actions/issues/594
4646
- name: Install asdf tools
4747
if: env.SKIP_RELEASE == ''
48-
# uses: asdf-vm/actions/install@v3
49-
uses: asdf-vm/actions/install@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
48+
uses: asdf-vm/actions/install@v4
49+
# uses: asdf-vm/actions/install@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
5050
with:
51-
asdf_version: 0.16.7
51+
asdf_version: 0.18.0
5252

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

.github/workflows/reviewdog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# UPDATE_HERE
1212
# https://github.com/actions/checkout/releases
1313
- name: Check out code into the Go module directory
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
# UPDATE_HERE
1717
# https://github.com/reviewdog/action-golangci-lint/releases

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
- --template-files=./README.md.gotmpl
1313
- repo: https://github.com/pre-commit/pre-commit-hooks
1414
# https://github.com/pre-commit/pre-commit-hooks/releases
15-
rev: v5.0.0
15+
rev: v6.0.0
1616
hooks:
1717
- id: check-symlinks
1818
- id: check-merge-conflict

.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.2
3+
kubebuilder 4.8.0
44
# https://golang.org/dl/
5-
golang 1.24.3
5+
golang 1.25.1
66
# https://github.com/mozilla/sops/releases
77
sops 3.10.2
88
# https://github.com/kubernetes-sigs/kustomize/releases
9-
kustomize 5.6.0
9+
kustomize 5.7.1
1010
# https://github.com/rancher/k3d/releases
1111
k3d 5.8.3
1212
# https://github.com/kubernetes/kubernetes/releases
13-
kubectl 1.33.0
13+
kubectl 1.34.0
1414
# https://github.com/helm/helm/releases
15-
helm 3.17.3
15+
helm 3.18.6
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.1.6
23+
golangci-lint 2.4.0
2424
# https://github.com/cli/cli/releases
25-
github-cli 2.72.0
25+
github-cli 2.78.0

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# https://wiki.ubuntu.com/Releases
33
# https://hub.docker.com/_/ubuntu/tags?page=1&name=plucky
44
# UPDATE_HERE
5-
FROM ubuntu:plucky-20250415 AS asdf-builder
5+
FROM ubuntu:plucky-20250730 AS asdf-builder
66

77
# UPDATE_HERE
88
# https://github.com/asdf-vm/asdf/releases
9-
ARG ASDF_VERSION=v0.16.7
9+
ARG ASDF_VERSION=v0.18.0
1010

1111
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1212

@@ -55,7 +55,7 @@ RUN CGO_ENABLED=0 GO111MODULE=on go build -a -o manager cmd/main.go
5555

5656
############################################################
5757
# UPDATE_HERE
58-
FROM ubuntu:plucky-20250415
58+
FROM ubuntu:plucky-20250730
5959

6060
# Install build tools
6161
RUN apt-get -y update \

Makefile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
# UPDATE_HERE
2-
# !!!!!!! NOTE: GOEXPERIMENT=nocoverageredesign is temp until 1.23.x
3-
GO := GOEXPERIMENT=nocoverageredesign GOPROXY=https://proxy.golang.org go
4-
SOPS_SEC_OPERATOR_VERSION := 0.16.0
2+
GO := GOPROXY=https://proxy.golang.org go
3+
SOPS_SEC_OPERATOR_VERSION := 0.17.0
54

65
# https://github.com/kubernetes-sigs/controller-tools/releases
7-
CONTROLLER_GEN_VERSION := "v0.18.0"
6+
CONTROLLER_GEN_VERSION := "v0.19.0"
87
# https://github.com/kubernetes-sigs/controller-runtime/releases
9-
CONTROLLER_RUNTIME_VERSION := "v0.20.4"
8+
CONTROLLER_RUNTIME_VERSION := "v0.22.0"
109
# https://github.com/kubernetes-sigs/kustomize/releases
11-
KUSTOMIZE_VERSION := "v5.6.0"
10+
KUSTOMIZE_VERSION := "v5.7.1"
1211
# use `setup-envtest list` to obtain the list of available versions
1312
# until fixed, can't use newer version, see:
1413
# https://github.com/kubernetes-sigs/controller-runtime/issues/1571
1514
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
16-
# https://storage.googleapis.com/kubebuilder-tools
17-
ENVTEST_K8S_VERSION := "1.30.2"
15+
# https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/master/envtest-releases.yaml
16+
ENVTEST_K8S_VERSION := "1.34.0"
1817

1918
# Use existing cluster instead of starting processes
2019
USE_EXISTING_CLUSTER ?= true

README.md

Lines changed: 3 additions & 1 deletion
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.34.x | v3.10.2 | 0.23.0 | 0.17.0 |
2627
| v1.33.x | v3.10.2 | 0.22.0 | 0.16.0 |
2728
| v1.32.x | v3.9.4 | 0.21.0 | 0.15.0 |
2829
| v1.31.x | v3.9.4 | 0.20.5 | 0.14.3 |
@@ -338,13 +339,14 @@ Projects and tools inspired development of `sops-secrets-operator`:
338339

339340
## Alternative tools
340341

342+
* [Sops Operator](https://github.com/peak-scale/sops-operator) (Peak Scale)
341343
* [Kubernetes external secrets](https://github.com/external-secrets/external-secrets)
342344
* [Vault Secrets Operator](https://github.com/ricoberger/vault-secrets-operator)
343345
* [Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets)
344346
* [Secrets Store CSI driver](https://github.com/kubernetes-sigs/secrets-store-csi-driver)
345347
* [Kamus](https://kamus.soluto.io/)
346348
* [Tesoro](https://github.com/kapicorp/tesoro)
347-
* [Sops Operator](https://github.com/craftypath/sops-operator)
349+
* [Sops Operator](https://github.com/craftypath/sops-operator) (Craftypath)
348350

349351
## Stargazers over time
350352

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.22.0
4-
appVersion: 0.16.0
3+
version: 0.23.0
4+
appVersion: 0.17.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.33.0"
7+
K8S_VERSION := "1.34.0"
88

99
SHELL=/bin/bash
1010

0 commit comments

Comments
 (0)