Skip to content

Commit

Permalink
Update go,k8s,base-image
Browse files Browse the repository at this point in the history
  • Loading branch information
isindir committed Apr 19, 2024
1 parent fd3a68f commit b4bb035
Show file tree
Hide file tree
Showing 13 changed files with 171 additions and 151 deletions.
12 changes: 6 additions & 6 deletions .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
# https://github.com/kubernetes-sigs/kubebuilder/releases
kubebuilder 3.14.1
# https://golang.org/dl/
golang 1.22.1
golang 1.22.2
# https://github.com/mozilla/sops/releases
sops 3.8.1
# https://github.com/kubernetes-sigs/kustomize/releases
kustomize 5.3.0
kustomize 5.4.1
# https://github.com/rancher/k3d/releases
k3d 5.6.0
k3d 5.6.3
# https://github.com/kubernetes/kubernetes/releases
kubectl 1.29.3
kubectl 1.29.4
# https://github.com/helm/helm/releases
helm 3.14.3
helm 3.14.4
# https://github.com/norwoodj/helm-docs/releases
helm-docs 1.13.1
# https://github.com/yannh/kubeconform/releases
Expand All @@ -22,4 +22,4 @@ git-chglog 0.15.4
# https://github.com/golangci/golangci-lint/releases
golangci-lint 1.57.2
# https://github.com/cli/cli/releases
github-cli 2.46.0
github-cli 2.48.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://wiki.ubuntu.com/Releases
# https://hub.docker.com/_/ubuntu/tags?page=1&name=noble
# UPDATE_HERE
FROM ubuntu:mantic-20240216 as asdf-builder
FROM ubuntu:noble-20240407.1 as asdf-builder

# UPDATE_HERE
# https://github.com/asdf-vm/asdf/releases
Expand Down Expand Up @@ -55,7 +55,7 @@ RUN CGO_ENABLED=0 GO111MODULE=on go build -a -o manager cmd/main.go

############################################################
# UPDATE_HERE
FROM ubuntu:mantic-20240216
FROM ubuntu:noble-20240407.1

# Install build tools
RUN apt-get -y update \
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# UPDATE_HERE
# !!!!!!! NOTE: GOEXPERIMENT=nocoverageredesign is temp until 1.23.x
GO := GOEXPERIMENT=nocoverageredesign GOPROXY=https://proxy.golang.org go
SOPS_SEC_OPERATOR_VERSION := 0.12.5
SOPS_SEC_OPERATOR_VERSION := 0.12.6

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_GEN_VERSION := "v0.14.0"
# https://github.com/kubernetes-sigs/controller-runtime/releases
CONTROLLER_RUNTIME_VERSION := "v0.17.2"
CONTROLLER_RUNTIME_VERSION := "v0.17.3"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION := "v5.3.0"
KUSTOMIZE_VERSION := "v5.4.1"
# use `setup-envtest list` to obtain the list of available versions
# until fixed, can't use newer version, see:
# https://github.com/kubernetes-sigs/controller-runtime/issues/1571
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ encrypted files stored in `git` repository.

| Kubernetes | Sops | Chart | Operator |
|---|---|---|---|
| v1.29.x | v3.8.1 | 0.18.5 | 0.12.5 |
| v1.29.x | v3.8.1 | 0.18.6 | 0.12.6 |
| v1.28.x | v3.8.1 | 0.17.4 | 0.11.4 |
| v1.27.x | v3.7.3 | 0.15.5 | 0.9.5 |
| v1.26.x | v3.7.3 | 0.14.2 | 0.8.2 |
Expand Down
4 changes: 2 additions & 2 deletions chart/helm3/sops-secrets-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
# UPDATE_HERE
version: 0.18.5
appVersion: 0.12.5
version: 0.18.6
appVersion: 0.12.6
type: application
description: Helm chart deploys sops-secrets-operator
name: sops-secrets-operator
Expand Down
2 changes: 1 addition & 1 deletion chart/helm3/sops-secrets-operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CHART_NAME?=$(shell cat Chart.yaml | awk 'BEGIN { FS=": " } $$0~/^name:/ { gsub(
VERSION_TAG?=$(shell cat Chart.yaml | awk 'BEGIN { FS=": " } $$0~/^version/ { gsub(/['\'',]/, ""); print $$2; }')

# UPDATE_HERE
K8S_VERSION := "1.29.3"
K8S_VERSION := "1.29.4"

SHELL=/bin/bash

Expand Down
4 changes: 2 additions & 2 deletions chart/helm3/sops-secrets-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ The following table lists the configurable parameters of the Sops-secrets-operat
| healthProbes.readiness | object | `{"initialDelaySeconds":5,"periodSeconds":10}` | Readiness probe configuration |
| image.pullPolicy | string | `"Always"` | Operator image pull policy |
| image.repository | string | `"isindir/sops-secrets-operator"` | Operator image name |
| image.tag | string | `"0.12.5"` | Operator image tag |
| image.tag | string | `"0.12.6"` | Operator image tag |
| imagePullSecrets | list | `[]` | Secrets to pull image from private docker repository |
| initImage.pullPolicy | string | `"Always"` | Init container image pull policy |
| initImage.repository | string | `"ubuntu"` | Init container image name |
| initImage.tag | string | `"mantic-20240216"` | Init container image tag |
| initImage.tag | string | `"noble-20240407.1"` | Init container image tag |
| kubeconfig | object | `{"enabled":false,"path":null}` | Paths to a kubeconfig. Only required if out-of-cluster. |
| logging | object | `{"development":false,"encoder":"json","level":"info","stacktraceLevel":"error","timeEncoding":"iso8601"}` | Logging configuration section suggested values Development Mode (encoder=consoleEncoder,logLevel=Debug,stackTraceLevel=Warn). Production Mode (encoder=jsonEncoder,logLevel=Info,stackTraceLevel=Error) (default) |
| logging.development | bool | `false` | Zap Development Mode enabled |
Expand Down
8 changes: 4 additions & 4 deletions chart/helm3/sops-secrets-operator/tests/operator_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ tests:
app.kubernetes.io/instance: sops
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: sops-secrets-operator
app.kubernetes.io/version: 0.12.5
helm.sh/chart: sops-secrets-operator-0.18.5
app.kubernetes.io/version: 0.12.6
helm.sh/chart: sops-secrets-operator-0.18.6

# custom name
- it: should correctly render custome name
Expand Down Expand Up @@ -170,7 +170,7 @@ tests:
# UPDATE_HERE
- equal:
path: spec.template.spec.containers[0].image
value: isindir/sops-secrets-operator:0.12.5
value: isindir/sops-secrets-operator:0.12.6
- equal:
path: spec.template.spec.containers[0].imagePullPolicy
value: Always
Expand Down Expand Up @@ -198,7 +198,7 @@ tests:
- equal:
path: spec.template.spec.initContainers[0].image
# UPDATE_HERE
value: ubuntu:mantic-20240216
value: ubuntu:noble-20240407.1
- equal:
path: spec.template.spec.initContainers[0].imagePullPolicy
value: Always
Expand Down
4 changes: 2 additions & 2 deletions chart/helm3/sops-secrets-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ image:
# -- Operator image name
repository: isindir/sops-secrets-operator
# -- Operator image tag
tag: 0.12.5
tag: 0.12.6
# -- Operator image pull policy
pullPolicy: Always

Expand All @@ -22,7 +22,7 @@ initImage:
# -- Init container image name
repository: ubuntu
# -- Init container image tag
tag: mantic-20240216
tag: noble-20240407.1
# -- Init container image pull policy
pullPolicy: Always

Expand Down
Loading

0 comments on commit b4bb035

Please sign in to comment.