Upgrade base image and few other components, including bumping k8s ap…

…i to 1.23.6 (#105)

* Upgrade base image and few other components, including bumping k8s api to 1.23.6

* Revert k3d version

* Add update_here target

* Fix typo

* add new helm package to the index

.circleci/config.yml

@@ -9,25 +9,28 @@ jobs:
     # UPDATE_HERE
     machine: &machine
       # https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
+      #  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-2004:202111-02
+      image: ubuntu-2004:202201-02
     environment: &versions
       # https://github.com/kubernetes/kubernetes/releases
-      KUBECTL_VERSION: v1.23.5
+      KUBECTL_VERSION: v1.23.6
       # https://hub.docker.com/r/rancher/k3s/tags
-      K3S_VERSION: v1.23.5-k3s1
+      K3S_VERSION: v1.23.6-k3s1
       # https://github.com/rancher/k3d/releases
+      #K3D_VERSION: v5.4.1
       K3D_VERSION: v4.4.8
       # https://github.com/helm/helm/releases
       HELM_VERSION: v3.8.2
       # https://golang.org/dl/
       GOLANG_VERSION: "1.18.1"
       # https://github.com/kubernetes-sigs/kubebuilder/releases
-      KUBEBUILDER_VERSION: 3.3.0
+      KUBEBUILDER_VERSION: 3.4.0
       # https://github.com/mozilla/sops/releases
       SOPS_VERSION: v3.7.2
       # https://github.com/kubernetes-sigs/kustomize/releases

.pre-commit-config.yaml

@@ -1,6 +1,7 @@
+# UPDATE_HERE: at least helm-docs
 repos:
 - repo: https://github.com/norwoodj/helm-docs
-  rev: v1.6.0
+  rev: v1.9.1
   hooks:
   - id: helm-docs
     args:

.tool-versions

@@ -1,20 +1,21 @@
 # UPDATE_HERE
 # https://github.com/kubernetes-sigs/kubebuilder/releases
-kubebuilder 3.3.0
+kubebuilder 3.4.0
 # https://golang.org/dl/
 golang 1.18.1
 # https://github.com/mozilla/sops/releases
 sops 3.7.2
 # https://github.com/kubernetes-sigs/kustomize/releases
 kustomize 4.5.4
 # https://github.com/rancher/k3d/releases
+#k3d 5.4.1
 k3d 4.4.8
 # https://github.com/kubernetes/kubernetes/releases
-kubectl 1.23.5
+kubectl 1.23.6
 # https://github.com/helm/helm/releases
 helm 3.8.2
 # https://github.com/norwoodj/helm-docs/releases
-helm-docs 1.8.1
+helm-docs 1.9.1
 # https://github.com/instrumenta/kubeval/releases
 kubeval v0.16.1
 # https://github.com/git-chglog/git-chglog/releases

Dockerfile

@@ -22,7 +22,7 @@ RUN CGO_ENABLED=0 GO111MODULE=on go build -a -o manager main.go
 
 # https://wiki.ubuntu.com/Releases
 # https://hub.docker.com/_/ubuntu?tab=tags&page=1&ordering=last_updated
-FROM ubuntu:focal-20220404
+FROM ubuntu:focal-20220426
 
 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.4.7
+SOPS_SEC_OPERATOR_VERSION := 0.4.8
 
 # https://github.com/kubernetes-sigs/controller-tools/releases
 CONTROLLER_GEN_VERSION := "v0.8.0"

README.md

@@ -23,7 +23,7 @@ encrypted files stored in `git` repository.
 
 | Kubernetes | Sops | Chart | Operator |
 |---|---|---|---|
-| v1.23.x | v3.7.2 | 0.10.7 | 0.4.7 |
+| v1.23.x | v3.7.2 | 0.10.8 | 0.4.8 |
 | v1.22.x | v3.7.1 | 0.9.7 | 0.3.7 |
 | v1.21.x | v3.7.1 | 0.9.6 | 0.3.6 |
 

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

@@ -1,7 +1,7 @@
 apiVersion: v2
 # UPDATE_HERE
-version: 0.10.7
-appVersion: 0.4.7
+version: 0.10.8
+appVersion: 0.4.8
 type: application
 description: Helm chart deploys sops-secrets-operator
 name: sops-secrets-operator

chart/helm3/sops-secrets-operator/Makefile

@@ -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.23.5"
+K8S_VERSION := "1.23.6"
 
 SHELL=/bin/bash
 

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

@@ -132,7 +132,7 @@ 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.4.7"` | Operator image tag |
+| image.tag | string | `"0.4.8"` | 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 |

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.4.7
-            helm.sh/chart: sops-secrets-operator-0.10.7
+            app.kubernetes.io/version: 0.4.8
+            helm.sh/chart: sops-secrets-operator-0.10.8
 
   # custom name
   - it: should correctly render custome name
@@ -171,7 +171,7 @@ tests:
       # UPDATE_HERE
       - equal:
           path: spec.template.spec.containers[0].image
-          value: isindir/sops-secrets-operator:0.4.7
+          value: isindir/sops-secrets-operator:0.4.8
       - equal:
           path: spec.template.spec.containers[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.4.7
+  tag: 0.4.8
   # -- Operator image pull policy
   pullPolicy: Always