Skip to content

Commit

Permalink
up: update sops,kube libraries and base docker image (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
isindir authored Dec 7, 2024
1 parent 4f49540 commit d93c7e6
Show file tree
Hide file tree
Showing 20 changed files with 400 additions and 329 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
environment: ci-cd
# UPDATE_HERE
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
# UPDATE_HERE
# https://hub.docker.com/r/rancher/k3s/tags
K3S_VERSION: v1.31.2-k3s1
K3S_VERSION: v1.31.3-k3s1
# https://github.com/helm-unittest/helm-unittest/releases
HELM_UNITTEST_VERSION: 0.6.3
HELM_UNITTEST_VERSION: 0.7.0

steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
environment: ci-cd
# UPDATE_HERE
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reviewdog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: runner / golangci-lint
# UPDATE_HERE
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
# UPDATE_HERE
# https://github.com/actions/checkout/releases
Expand Down
16 changes: 8 additions & 8 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# UPDATE_HERE
# https://github.com/kubernetes-sigs/kubebuilder/releases
kubebuilder 4.2.0
kubebuilder 4.3.1
# https://golang.org/dl/
golang 1.23.2
golang 1.23.4
# https://github.com/mozilla/sops/releases
sops 3.9.1
sops 3.9.2
# https://github.com/kubernetes-sigs/kustomize/releases
kustomize 5.5.0
# https://github.com/rancher/k3d/releases
k3d 5.7.4
k3d 5.7.5
# https://github.com/kubernetes/kubernetes/releases
kubectl 1.31.1
kubectl 1.31.3
# https://github.com/helm/helm/releases
helm 3.16.2
helm 3.16.3
# https://github.com/norwoodj/helm-docs/releases
helm-docs 1.14.2
# https://github.com/yannh/kubeconform/releases
kubeconform 0.6.7
# https://github.com/git-chglog/git-chglog/releases
git-chglog 0.15.4
# https://github.com/golangci/golangci-lint/releases
golangci-lint 1.61.0
golangci-lint 1.62.2
# https://github.com/cli/cli/releases
github-cli 2.58.0
github-cli 2.63.2
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=oracular
# UPDATE_HERE
FROM ubuntu:oracular-20241009 AS asdf-builder
FROM ubuntu:oracular-20241120 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:oracular-20241009
FROM ubuntu:oracular-20241120

# 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,12 +1,12 @@
# 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.14.1
SOPS_SEC_OPERATOR_VERSION := 0.14.2

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_GEN_VERSION := "v0.16.4"
CONTROLLER_GEN_VERSION := "v0.16.5"
# https://github.com/kubernetes-sigs/controller-runtime/releases
CONTROLLER_RUNTIME_VERSION := "v0.19.0"
CONTROLLER_RUNTIME_VERSION := "v0.19.3"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION := "v5.5.0"
# use `setup-envtest list` to obtain the list of available versions
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.31.x | v3.9.1 | 0.20.3 | 0.14.1 |
| v1.31.x | v3.9.2 | 0.20.4 | 0.14.2 |
| v1.30.x | v3.9.0 | 0.19.4 | 0.13.3 |
| v1.29.x | v3.8.1 | 0.18.6 | 0.12.6 |
| v1.28.x | v3.8.1 | 0.17.4 | 0.11.4 |
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.20.3
appVersion: 0.14.1
version: 0.20.4
appVersion: 0.14.2
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.31.1"
K8S_VERSION := "1.31.3"

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.14.1"` | Operator image tag |
| image.tag | string | `"0.14.2"` | 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 | `"oracular-20241009"` | Init container image tag |
| initImage.tag | string | `"oracular-20241120"` | Init container image tag |
| kubeconfig | object | `{"enabled":false,"path":null}` | Paths to a kubeconfig. Only required if out-of-cluster. |
| logging.development | bool | `false` | Zap Development Mode enabled |
| logging.encoder | string | `"json"` | Zap log encoding (one of 'json' or 'console') |
Expand Down
4 changes: 2 additions & 2 deletions chart/helm3/sops-secrets-operator/tests/monitor_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ tests:
app.kubernetes.io/instance: sops
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: sops-secrets-operator
app.kubernetes.io/version: "0.14.1"
helm.sh/chart: sops-secrets-operator-0.20.3
app.kubernetes.io/version: "0.14.2"
helm.sh/chart: sops-secrets-operator-0.20.4
custom-label: custom-value
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 @@ -30,8 +30,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.14.1
helm.sh/chart: sops-secrets-operator-0.20.3
app.kubernetes.io/version: 0.14.2
helm.sh/chart: sops-secrets-operator-0.20.4

# custom name
- it: should correctly render custome name
Expand Down Expand Up @@ -169,7 +169,7 @@ tests:
# UPDATE_HERE
- equal:
path: spec.template.spec.containers[0].image
value: isindir/sops-secrets-operator:0.14.1
value: isindir/sops-secrets-operator:0.14.2
- equal:
path: spec.template.spec.containers[0].imagePullPolicy
value: Always
Expand Down Expand Up @@ -197,7 +197,7 @@ tests:
- equal:
path: spec.template.spec.initContainers[0].image
# UPDATE_HERE
value: ubuntu:oracular-20241009
value: ubuntu:oracular-20241120
- equal:
path: spec.template.spec.initContainers[0].imagePullPolicy
value: Always
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,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.14.1
helm.sh/chart: sops-secrets-operator-0.20.3
app.kubernetes.io/version: 0.14.2
helm.sh/chart: sops-secrets-operator-0.20.4

# custom name
- it: should correctly render custome service account name
Expand Down
5 changes: 2 additions & 3 deletions chart/helm3/sops-secrets-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ image:
# -- Operator image name
repository: isindir/sops-secrets-operator
# -- Operator image tag
tag: 0.14.1
tag: 0.14.2
# -- Operator image pull policy
pullPolicy: Always

Expand All @@ -25,8 +25,7 @@ initImage:
# -- Init container image name
repository: ubuntu
# -- Init container image tag
tag: oracular-20241009

tag: oracular-20241120
# -- 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 @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
controller-gen.kubebuilder.io/version: v0.16.5
name: sopssecrets.isindir.github.com
spec:
group: isindir.github.com
Expand Down
Loading

0 comments on commit d93c7e6

Please sign in to comment.