up: golang, ubuntu base image (#144)

.circleci/config.yml

@@ -9,14 +9,9 @@ jobs:
     # UPDATE_HERE
     machine: &machine
       # https://circleci.com/developer/machine/image/ubuntu-2204
-      #  ubuntu-2004:202201-02 - Ubuntu 20.04, Docker v20.10.12, Docker Compose v1.29.2, Google Cloud SDK updates
-      #  ubuntu-2004:202201-01 - Ubuntu 20.04, Docker v20.10.12, Docker Compose v1.29.2
-      #  ubuntu-2004:202111-02 - Ubuntu 20.04, Docker v20.10.11, Docker Compose v1.29.2, log4j updates
-      #  ubuntu-2004:202111-01 - Ubuntu 20.04, Docker v20.10.11, Docker Compose v1.29.2,
-      #  ubuntu-2004:202107-02 - Ubuntu 20.04, Docker v20.10.7, Docker Compose v1.29.2,
       # https://githubmemory.com/repo/rancher/k3d/issues/807
       #  It doesn't happen anymore after upgrading from Docker 2.10.2 and containerd 1.4.3 to Docker 2.10.9 and containerd 1.4.11
-      image: ubuntu-2204:2023.02.1
+      image: ubuntu-2204:2023.07.2
     environment: &versions
       # https://github.com/kubernetes/kubernetes/releases
       KUBECTL_VERSION: v1.27.4
@@ -27,13 +22,13 @@ jobs:
       # https://github.com/helm/helm/releases
       HELM_VERSION: v3.12.2
       # https://golang.org/dl/
-      GOLANG_VERSION: "1.20.7"
+      GOLANG_VERSION: "1.21.0"
       # https://github.com/kubernetes-sigs/kubebuilder/releases
       KUBEBUILDER_VERSION: 3.11.1
       # https://github.com/mozilla/sops/releases
       SOPS_VERSION: v3.7.3
       # https://github.com/kubernetes-sigs/kustomize/releases
-      KUSTOMIZE_VERSION: v5.0.3
+      KUSTOMIZE_VERSION: v5.1.1
       # https://github.com/helm-unittest/helm-unittest/releases
       HELM_UNITTEST_VERSION: 0.3.4
       # https://github.com/instrumenta/kubeval/releases

.tool-versions

@@ -2,7 +2,7 @@
 # https://github.com/kubernetes-sigs/kubebuilder/releases
 kubebuilder 3.11.1
 # https://golang.org/dl/
-golang 1.20.7
+golang 1.21.0
 # https://github.com/mozilla/sops/releases
 sops 3.7.3
 # https://github.com/kubernetes-sigs/kustomize/releases
@@ -19,4 +19,4 @@ helm-docs 1.11.0
 kubeval v0.16.1
 # https://github.com/git-chglog/git-chglog/releases
 git-chglog 0.15.4
-golangci-lint 1.53.3
+golangci-lint 1.54.0

Dockerfile

@@ -2,7 +2,7 @@
 # Build the manager binary
 # https://www.debian.org/releases/
 # https://hub.docker.com/_/golang/tags?page=1&name=bullseye
-FROM golang:1.20.7-bullseye as builder
+FROM golang:1.21.0-bullseye as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -22,7 +22,7 @@ RUN CGO_ENABLED=0 GO111MODULE=on go build -a -o manager cmd/main.go
 
 # https://wiki.ubuntu.com/Releases
 # https://hub.docker.com/_/ubuntu/tags?page=1&name=jammy
-FROM ubuntu:jammy-20230624
+FROM ubuntu:lunar-20230731
 
 RUN apt-get -y update \
       && apt-get -y upgrade \

Makefile

@@ -1,6 +1,6 @@
 # UPDATE_HERE
 GO := GOPROXY=https://proxy.golang.org go
-SOPS_SEC_OPERATOR_VERSION := 0.9.3
+SOPS_SEC_OPERATOR_VERSION := 0.9.4
 
 # https://github.com/kubernetes-sigs/controller-tools/releases
 CONTROLLER_GEN_VERSION := "v0.12.1"

README.md

@@ -23,7 +23,7 @@ encrypted files stored in `git` repository.
 
 | Kubernetes | Sops | Chart | Operator |
 |---|---|---|---|
-| v1.27.x | v3.7.3 | 0.15.3 | 0.9.3 |
+| v1.27.x | v3.7.3 | 0.15.4 | 0.9.4 |
 | v1.26.x | v3.7.3 | 0.14.2 | 0.8.2 |
 | v1.25.x | v3.7.3 | 0.12.5 | 0.6.4 |
 | v1.24.x | v3.7.3 | 0.11.3 | 0.5.3 |

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

@@ -1,7 +1,7 @@
 apiVersion: v2
 # UPDATE_HERE
-version: 0.15.3
-appVersion: 0.9.3
+version: 0.15.4
+appVersion: 0.9.4
 type: application
 description: Helm chart deploys sops-secrets-operator
 name: sops-secrets-operator

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

@@ -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.9.3"` | Operator image tag |
+| image.tag | string | `"0.9.4"` | 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 | `"jammy-20230624"` | Init container image tag |
+| initImage.tag | string | `"lunar-20230731"` | 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 |

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

@@ -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.9.3
-            helm.sh/chart: sops-secrets-operator-0.15.3
+            app.kubernetes.io/version: 0.9.4
+            helm.sh/chart: sops-secrets-operator-0.15.4
 
   # custom name
   - it: should correctly render custome name
@@ -170,7 +170,7 @@ tests:
       # UPDATE_HERE
       - equal:
           path: spec.template.spec.containers[0].image
-          value: isindir/sops-secrets-operator:0.9.3
+          value: isindir/sops-secrets-operator:0.9.4
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
           value: Always
@@ -198,7 +198,7 @@ tests:
       - equal:
           path: spec.template.spec.initContainers[0].image
           # UPDATE_HERE
-          value: ubuntu:jammy-20230624
+          value: ubuntu:lunar-20230731
       - equal:
           path: spec.template.spec.initContainers[0].imagePullPolicy
           value: Always

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

@@ -13,7 +13,7 @@ image:
   # -- Operator image name
   repository: isindir/sops-secrets-operator
   # -- Operator image tag
-  tag: 0.9.3
+  tag: 0.9.4
   # -- Operator image pull policy
   pullPolicy: Always
 
@@ -22,7 +22,7 @@ initImage:
   # -- Init container image name
   repository: ubuntu
   # -- Init container image tag
-  tag: jammy-20230624
+  tag: lunar-20230731
   # -- Init container image pull policy
   pullPolicy: Always