Skip to content

Commit

Permalink
build: k8s, base image, golang, controller-runtime (#175)
Browse files Browse the repository at this point in the history
* build: k8s, base image, golang, controller-runtime

* Fix typo
  • Loading branch information
isindir authored May 19, 2024
1 parent e8ce647 commit 828301c
Show file tree
Hide file tree
Showing 16 changed files with 207 additions and 194 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
env:
# UPDATE_HERE
# https://hub.docker.com/r/rancher/k3s/tags
K3S_VERSION: v1.29.3-k3s1
K3S_VERSION: v1.30.0-k3s1
# https://github.com/helm-unittest/helm-unittest/releases
HELM_UNITTEST_VERSION: 0.4.4
HELM_UNITTEST_VERSION: 0.5.1

steps:

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repos:
- --template-files=./README.md.gotmpl
- repo: https://github.com/pre-commit/pre-commit-hooks
# https://github.com/pre-commit/pre-commit-hooks/releases
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-symlinks
- id: check-merge-conflict
Expand Down
14 changes: 7 additions & 7 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 3.14.1
kubebuilder 3.15.0
# https://golang.org/dl/
golang 1.22.2
golang 1.22.3
# https://github.com/mozilla/sops/releases
sops 3.8.1
# https://github.com/kubernetes-sigs/kustomize/releases
kustomize 5.4.1
# https://github.com/rancher/k3d/releases
k3d 5.6.3
# https://github.com/kubernetes/kubernetes/releases
kubectl 1.29.4
kubectl 1.30.1
# https://github.com/helm/helm/releases
helm 3.14.4
helm 3.15.0
# https://github.com/norwoodj/helm-docs/releases
helm-docs 1.13.1
# https://github.com/yannh/kubeconform/releases
kubeconform 0.6.4
kubeconform 0.6.6
# https://github.com/git-chglog/git-chglog/releases
git-chglog 0.15.4
# https://github.com/golangci/golangci-lint/releases
golangci-lint 1.57.2
golangci-lint 1.58.1
# https://github.com/cli/cli/releases
github-cli 2.48.0
github-cli 2.49.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=noble
# UPDATE_HERE
FROM ubuntu:mantic-20240405 as asdf-builder
FROM ubuntu:mantic-20240427 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:mantic-20240405
FROM ubuntu:mantic-20240427

# Install build tools
RUN apt-get -y update \
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# 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.12.6
GO := GOEXPERIMENT=nocoverageredesign GOPROXY=https://proxy.golang.org go
SOPS_SEC_OPERATOR_VERSION := 0.13.0

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_GEN_VERSION := "v0.14.0"
CONTROLLER_GEN_VERSION := "v0.15.0"
# https://github.com/kubernetes-sigs/controller-runtime/releases
CONTROLLER_RUNTIME_VERSION := "v0.17.3"
CONTROLLER_RUNTIME_VERSION := "v0.18.2"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION := "v5.4.1"
# 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
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
# https://storage.googleapis.com/kubebuilder-tools
ENVTEST_K8S_VERSION := "1.29.3"
ENVTEST_K8S_VERSION := "1.30.0"

# Use existing cluster instead of starting processes
USE_EXISTING_CLUSTER ?= true
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ encrypted files stored in `git` repository.

| Kubernetes | Sops | Chart | Operator |
|---|---|---|---|
| v1.30.x | v3.8.1 | 0.19.0 | 0.13.0 |
| v1.29.x | v3.8.1 | 0.18.6 | 0.12.6 |
| v1.28.x | v3.8.1 | 0.17.4 | 0.11.4 |
| v1.27.x | v3.7.3 | 0.15.5 | 0.9.5 |
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.18.6
appVersion: 0.12.6
version: 0.19.0
appVersion: 0.13.0
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.29.4"
K8S_VERSION := "1.30.1"

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.12.6"` | Operator image tag |
| image.tag | string | `"0.13.0"` | 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 | `"mantic-20240405"` | Init container image tag |
| initImage.tag | string | `"mantic-20240427"` | 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 |
Expand Down
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 @@ -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.12.6
helm.sh/chart: sops-secrets-operator-0.18.6
app.kubernetes.io/version: 0.13.0
helm.sh/chart: sops-secrets-operator-0.19.0

# custom name
- it: should correctly render custome name
Expand Down Expand Up @@ -170,7 +170,7 @@ tests:
# UPDATE_HERE
- equal:
path: spec.template.spec.containers[0].image
value: isindir/sops-secrets-operator:0.12.6
value: isindir/sops-secrets-operator:0.13.0
- equal:
path: spec.template.spec.containers[0].imagePullPolicy
value: Always
Expand Down Expand Up @@ -198,7 +198,7 @@ tests:
- equal:
path: spec.template.spec.initContainers[0].image
# UPDATE_HERE
value: ubuntu:mantic-20240405
value: ubuntu:mantic-20240427
- 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.12.6
tag: 0.13.0
# -- Operator image pull policy
pullPolicy: Always

Expand All @@ -22,7 +22,7 @@ initImage:
# -- Init container image name
repository: ubuntu
# -- Init container image tag
tag: mantic-20240405
tag: mantic-20240427
# -- 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.14.0
controller-gen.kubebuilder.io/version: v0.15.0
name: sopssecrets.isindir.github.com
spec:
group: isindir.github.com
Expand Down
Loading

0 comments on commit 828301c

Please sign in to comment.