up: golang 1.17.8, sops 3.7.2 and base image (#101)

* up: golang 1.17.8, sops 3.7.2 and base image * Fix typo * Fix typo Co-authored-by: Eriks Zelenka <[email protected]>
isindir · Mar 11, 2022 · 4db467a · 4db467a
1 parent ea001ba
commit 4db467a
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 83 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,11 +9,12 @@ jobs:
     # UPDATE_HERE
     machine: &machine
       # https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
+      #  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-01
+      image: ubuntu-2004:202111-02
     environment: &versions
       # https://github.com/kubernetes/kubernetes/releases
       KUBECTL_VERSION: v1.23.1
@@ -22,13 +23,13 @@ jobs:
       # https://github.com/rancher/k3d/releases
       K3D_VERSION: v4.4.8
       # https://github.com/helm/helm/releases
-      HELM_VERSION: v3.8.0
+      HELM_VERSION: v3.8.1
       # https://golang.org/dl/
-      GOLANG_VERSION: "1.17.7"
+      GOLANG_VERSION: "1.17.8"
       # https://github.com/kubernetes-sigs/kubebuilder/releases
       KUBEBUILDER_VERSION: 3.3.0
       # https://github.com/mozilla/sops/releases
-      SOPS_VERSION: v3.7.1
+      SOPS_VERSION: v3.7.2
       # https://github.com/kubernetes-sigs/kustomize/releases
       KUSTOMIZE_VERSION: v4.5.2
       # https://github.com/quintush/helm-unittest/releases
@@ -40,7 +41,7 @@ jobs:
       # https://github.com/git-chglog/git-chglog/releases
       GIT_CHGLOG_VERSION: 0.15.1
       # https://github.com/docker/buildx/releases
-      BUILDX_BINARY_VERSION: 0.7.1
+      BUILDX_BINARY_VERSION: 0.8.0
 
       DOCKER_BUILDKIT: 1
       BUILDX_PLATFORMS: linux/amd64,linux/arm64

diff --git a/.tool-versions b/.tool-versions
@@ -2,17 +2,17 @@
 # https://github.com/kubernetes-sigs/kubebuilder/releases
 kubebuilder 3.3.0
 # https://golang.org/dl/
-golang 1.17.7
+golang 1.17.8
 # https://github.com/mozilla/sops/releases
-sops 3.7.1
+sops 3.7.2
 # https://github.com/kubernetes-sigs/kustomize/releases
 kustomize 4.5.2
 # https://github.com/rancher/k3d/releases
 k3d 4.4.8
 # https://github.com/kubernetes/kubernetes/releases
 kubectl 1.23.1
 # https://github.com/helm/helm/releases
-helm 3.8.0
+helm 3.8.1
 # https://github.com/norwoodj/helm-docs/releases
 helm-docs 1.7.0
 # https://github.com/instrumenta/kubeval/releases

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # Build the manager binary
 # https://www.debian.org/releases/
 # https://hub.docker.com/_/golang?tab=tags&page=1&ordering=last_updated
-FROM golang:1.17.7-bullseye as builder
+FROM golang:1.17.8-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 main.go
 
 # https://wiki.ubuntu.com/Releases
 # https://hub.docker.com/_/ubuntu?tab=tags&page=1&ordering=last_updated
-FROM ubuntu:focal-20220113
+FROM ubuntu:focal-20220302
 
 RUN apt-get -y update \
       && apt-get -y upgrade \

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # UPDATE_HERE
 GO := GOPROXY=https://proxy.golang.org go
-SOPS_SEC_OPERATOR_VERSION := 0.4.4
+SOPS_SEC_OPERATOR_VERSION := 0.4.5
 
 # https://github.com/kubernetes-sigs/controller-tools/releases
 CONTROLLER_GEN_VERSION := "v0.8.0"

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ encrypted files stored in `git` repository.
 
 | Kubernetes | Sops | Chart | Operator |
 |---|---|---|---|
-| v1.23.x | v3.7.1 | 0.10.4 | 0.4.4 |
+| v1.23.x | v3.7.2 | 0.10.5 | 0.4.5 |
 | v1.22.x | v3.7.1 | 0.9.7 | 0.3.7 |
 | v1.21.x | v3.7.1 | 0.9.6 | 0.3.6 |
 

diff --git a/chart/helm3/sops-secrets-operator/Chart.yaml b/chart/helm3/sops-secrets-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 # UPDATE_HERE
-version: 0.10.4
-appVersion: 0.4.4
+version: 0.10.5
+appVersion: 0.4.5
 type: application
 description: Helm chart deploys sops-secrets-operator
 name: sops-secrets-operator

diff --git a/chart/helm3/sops-secrets-operator/Makefile b/chart/helm3/sops-secrets-operator/Makefile
@@ -3,6 +3,7 @@
 CHART_NAME?=$(shell cat Chart.yaml | awk 'BEGIN { FS=": " } $$0~/^name:/ { gsub(/['\'',]/, ""); print $$2; }')
 VERSION_TAG?=$(shell cat Chart.yaml | awk 'BEGIN { FS=": " } $$0~/^version/ { gsub(/['\'',]/, ""); print $$2; }')
 
+# UPDATE_HERE
 K8S_VERSION := "1.23.1"
 
 SHELL=/bin/bash

diff --git a/chart/helm3/sops-secrets-operator/README.md b/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.4"` | Operator image tag |
+| image.tag | string | `"0.4.5"` | 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 |

diff --git a/chart/helm3/sops-secrets-operator/tests/operator_test.yaml b/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.4
-            helm.sh/chart: sops-secrets-operator-0.10.4
+            app.kubernetes.io/version: 0.4.5
+            helm.sh/chart: sops-secrets-operator-0.10.5
 
   # 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.4
+          value: isindir/sops-secrets-operator:0.4.5
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
           value: Always

diff --git a/chart/helm3/sops-secrets-operator/values.yaml b/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.4
+  tag: 0.4.5
   # -- Operator image pull policy
   pullPolicy: Always
 

diff --git a/config/crd/bases/isindir.github.com_sopssecrets.yaml b/config/crd/bases/isindir.github.com_sopssecrets.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
+    controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   name: sopssecrets.isindir.github.com
 spec:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole