Skip to content

Commit

Permalink
up: update golang and base image (#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
isindir authored Feb 25, 2022
1 parent b5879dc commit ea001ba
Show file tree
Hide file tree
Showing 14 changed files with 115 additions and 88 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ jobs:
# https://github.com/rancher/k3d/releases
K3D_VERSION: v4.4.8
# https://github.com/helm/helm/releases
HELM_VERSION: v3.7.2
HELM_VERSION: v3.8.0
# https://golang.org/dl/
GOLANG_VERSION: "1.17.6"
GOLANG_VERSION: "1.17.7"
# https://github.com/kubernetes-sigs/kubebuilder/releases
KUBEBUILDER_VERSION: 3.3.0
# https://github.com/mozilla/sops/releases
SOPS_VERSION: v3.7.1
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION: v4.4.1
KUSTOMIZE_VERSION: v4.5.2
# https://github.com/quintush/helm-unittest/releases
HELM_UNITTEST_VERSION: 0.2.8
# https://github.com/instrumenta/kubeval/releases
Expand Down
8 changes: 4 additions & 4 deletions .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# https://github.com/kubernetes-sigs/kubebuilder/releases
kubebuilder 3.3.0
# https://golang.org/dl/
golang 1.17.6
golang 1.17.7
# https://github.com/mozilla/sops/releases
sops 3.7.1
# https://github.com/kubernetes-sigs/kustomize/releases
kustomize 4.4.1
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.7.2
helm 3.8.0
# https://github.com/norwoodj/helm-docs/releases
helm-docs 1.5.0
helm-docs 1.7.0
# https://github.com/instrumenta/kubeval/releases
kubeval v0.16.1
# https://github.com/git-chglog/git-chglog/releases
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-bullseye as builder
FROM golang:1.17.7-bullseye as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand All @@ -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-20220105
FROM ubuntu:focal-20220113

RUN apt-get -y update \
&& apt-get -y upgrade \
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# UPDATE_HERE
GO := GOPROXY=https://proxy.golang.org go
SOPS_SEC_OPERATOR_VERSION := 0.4.3
SOPS_SEC_OPERATOR_VERSION := 0.4.4

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_GEN_VERSION := "v0.8.0"
# https://github.com/kubernetes-sigs/controller-runtime/releases
CONTROLLER_RUNTIME_VERSION := "v0.11.0"
CONTROLLER_RUNTIME_VERSION := "v0.11.1"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION := "v4.4.1"
KUSTOMIZE_VERSION := "v4.5.2"
# 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.23.x | v3.7.1 | 0.10.3 | 0.4.3 |
| v1.23.x | v3.7.1 | 0.10.4 | 0.4.4 |
| v1.22.x | v3.7.1 | 0.9.7 | 0.3.7 |
| v1.21.x | v3.7.1 | 0.9.6 | 0.3.6 |

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.10.3
appVersion: 0.4.3
version: 0.10.4
appVersion: 0.4.4
type: application
description: Helm chart deploys sops-secrets-operator
name: sops-secrets-operator
Expand Down
5 changes: 3 additions & 2 deletions chart/helm3/sops-secrets-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ The following table lists the configurable parameters of the Sops-secrets-operat
| azure.clientId | string | `""` | ClientID (Application ID) of Azure Service Principal to use |
| azure.clientSecret | string | `""` | Client Secret of Azure Service Principal |
| azure.enabled | bool | `false` | if true Azure KeyVault will be used |
| azure.existingSecretName | string | `""` | Name of a pre-existing secret containing Azure Service Principal Credentials (ClientID, ClientSecret, TenantID) |
| azure.tenantId | string | `""` | TenantID of Azure Service principal to use |
| extraEnv | list | `[]` | A list of additional environment variables |
| fullnameOverride | string | `""` | Overrides auto-generated long resource name |
Expand All @@ -131,11 +132,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.4.3"` | Operator image tag |
| image.tag | string | `"0.4.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 | `"focal-20211006"` | Init container image tag |
| initImage.tag | string | `"focal-20220113"` | Init container image tag |
| kubeconfig | object | `{"enabled":false,"path":null}` | Paths to a kubeconfig. Only required if out-of-cluster. |
| logging | object | `{"encoder":"json","level":"info","stacktraceLevel":"error"}` | Logging configuration section suggested values Development Mode (encoder=consoleEncoder,logLevel=Debug,stackTraceLevel=Warn). Production Mode (encoder=jsonEncoder,logLevel=Info,stackTraceLevel=Error) (default) |
| logging.encoder | string | `"json"` | Zap log encoding (one of 'json' or 'console') |
Expand Down
9 changes: 5 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.4.3
helm.sh/chart: sops-secrets-operator-0.10.3
app.kubernetes.io/version: 0.4.4
helm.sh/chart: sops-secrets-operator-0.10.4

# custom name
- it: should correctly render custome name
Expand Down Expand Up @@ -171,7 +171,7 @@ tests:
# UPDATE_HERE
- equal:
path: spec.template.spec.containers[0].image
value: isindir/sops-secrets-operator:0.4.3
value: isindir/sops-secrets-operator:0.4.4
- equal:
path: spec.template.spec.containers[0].imagePullPolicy
value: Always
Expand All @@ -198,7 +198,8 @@ tests:
asserts:
- equal:
path: spec.template.spec.initContainers[0].image
value: ubuntu:focal-20211006
# UPDATE_HERE
value: ubuntu:focal-20220113
- 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.4.3
tag: 0.4.4
# -- Operator image pull policy
pullPolicy: Always

Expand All @@ -22,7 +22,7 @@ initImage:
# -- Init container image name
repository: ubuntu
# -- Init container image tag
tag: focal-20211006
tag: focal-20220113
# -- Init container image pull policy
pullPolicy: Always

Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/isindir.github.com_sopssecrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: sopssecrets.isindir.github.com
spec:
Expand Down
Loading

0 comments on commit ea001ba

Please sign in to comment.