Skip to content

Commit

Permalink
up: update base image and k8s version (#136)
Browse files Browse the repository at this point in the history
* up: update base image and k8s version

* package help chart

* Fix typo
  • Loading branch information
isindir authored May 30, 2023
1 parent 0805922 commit 0992896
Show file tree
Hide file tree
Showing 16 changed files with 194 additions and 182 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,31 @@ jobs:
image: ubuntu-2204:2023.02.1
environment: &versions
# https://github.com/kubernetes/kubernetes/releases
KUBECTL_VERSION: v1.26.4
KUBECTL_VERSION: v1.27.2
# https://hub.docker.com/r/rancher/k3s/tags
K3S_VERSION: v1.26.1-k3s1
K3S_VERSION: v1.27.2-k3s1
# https://github.com/rancher/k3d/releases
K3D_VERSION: v5.4.9
K3D_VERSION: v5.5.1
# https://github.com/helm/helm/releases
HELM_VERSION: v3.11.3
HELM_VERSION: v3.12.0
# https://golang.org/dl/
GOLANG_VERSION: "1.20.3"
GOLANG_VERSION: "1.20.4"
# https://github.com/kubernetes-sigs/kubebuilder/releases
KUBEBUILDER_VERSION: 3.10.0
# https://github.com/mozilla/sops/releases
SOPS_VERSION: v3.7.3
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION: v5.0.1
KUSTOMIZE_VERSION: v5.0.3
# https://github.com/helm-unittest/helm-unittest/releases
HELM_UNITTEST_VERSION: 0.3.1
HELM_UNITTEST_VERSION: 0.3.3
# https://github.com/instrumenta/kubeval/releases
KUBEVAL_VERSION: 0.16.1
# https://github.com/github/hub/releases
HUB_VERSION: 2.14.2
# https://github.com/git-chglog/git-chglog/releases
GIT_CHGLOG_VERSION: 0.15.4
# https://github.com/docker/buildx/releases
BUILDX_BINARY_VERSION: 0.10.4
BUILDX_BINARY_VERSION: 0.10.5

DOCKER_BUILDKIT: 1
BUILDX_PLATFORMS: linux/amd64,linux/arm64
Expand Down
10 changes: 5 additions & 5 deletions .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
# https://github.com/kubernetes-sigs/kubebuilder/releases
kubebuilder 3.10.0
# https://golang.org/dl/
golang 1.20.3
golang 1.20.4
# https://github.com/mozilla/sops/releases
sops 3.7.3
# https://github.com/kubernetes-sigs/kustomize/releases
kustomize 5.0.1
kustomize 5.0.3
# https://github.com/rancher/k3d/releases
k3d 5.4.9
k3d 5.5.1
# https://github.com/kubernetes/kubernetes/releases
kubectl 1.26.4
kubectl 1.27.2
# https://github.com/helm/helm/releases
helm 3.11.3
helm 3.12.0
# https://github.com/norwoodj/helm-docs/releases
helm-docs 1.11.0
# https://github.com/instrumenta/kubeval/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/tags?page=1&name=bullseye
FROM golang:1.20.3-bullseye as builder
FROM golang:1.20.4-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 cmd/main.go

# https://wiki.ubuntu.com/Releases
# https://hub.docker.com/_/ubuntu/tags?page=1&name=jammy
FROM ubuntu:jammy-20230308
FROM ubuntu:jammy-20230425

RUN apt-get -y update \
&& apt-get -y upgrade \
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# UPDATE_HERE
GO := GOPROXY=https://proxy.golang.org go
SOPS_SEC_OPERATOR_VERSION := 0.8.2
SOPS_SEC_OPERATOR_VERSION := 0.9.0

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_GEN_VERSION := "v0.11.3"
CONTROLLER_GEN_VERSION := "v0.12.0"
# https://github.com/kubernetes-sigs/controller-runtime/releases
CONTROLLER_RUNTIME_VERSION := "v0.14.6"
CONTROLLER_RUNTIME_VERSION := "v0.15.0"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION := "v5.0.1"
KUSTOMIZE_VERSION := "v5.0.3"
# 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.26.1"
ENVTEST_K8S_VERSION := "1.27.1"

# Use existing cluster instead of starting processes
USE_EXISTING_CLUSTER ?= true
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[![Go Report Card](https://goreportcard.com/badge/github.com/isindir/sops-secrets-operator?)](https://goreportcard.com/report/github.com/isindir/sops-secrets-operator)
[![github.com/isindir/sops-secrets-operator](/advisor/golang/github.com/isindir/sops-secrets-operator/badge.svg)](/advisor/golang/github.com/isindir/sops-secrets-operator)
[![CircleCI](https://circleci.com/gh/isindir/sops-secrets-operator.svg?style=svg)](https://circleci.com/gh/isindir/sops-secrets-operator)
[![GitHub release](https://img.shields.io/github/tag/isindir/sops-secrets-operator.svg)](https://github.com/isindir/sops-secrets-operator/releases)
[![Docker pulls](https://img.shields.io/docker/pulls/isindir/sops-secrets-operator.svg)](https://hub.docker.com/r/isindir/sops-secrets-operator)
Expand All @@ -24,6 +23,7 @@ encrypted files stored in `git` repository.

| Kubernetes | Sops | Chart | Operator |
|---|---|---|---|
| v1.27.x | v3.7.3 | 0.15.0 | 0.9.0 |
| v1.26.x | v3.7.3 | 0.14.2 | 0.8.2 |
| v1.25.x | v3.7.3 | 0.12.5 | 0.6.4 |
| v1.24.x | v3.7.3 | 0.11.3 | 0.5.3 |
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.14.2
appVersion: 0.8.2
version: 0.15.0
appVersion: 0.9.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.26.4"
K8S_VERSION := "1.27.2"

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.8.2"` | Operator image tag |
| image.tag | string | `"0.9.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 | `"jammy-20230308"` | Init container image tag |
| initImage.tag | string | `"jammy-20230425"` | 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
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.8.2
helm.sh/chart: sops-secrets-operator-0.14.2
app.kubernetes.io/version: 0.9.0
helm.sh/chart: sops-secrets-operator-0.15.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.8.2
value: isindir/sops-secrets-operator:0.9.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:jammy-20230308
value: ubuntu:jammy-20230425
- 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.8.2
tag: 0.9.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: jammy-20230308
tag: jammy-20230425
# -- Init container image pull policy
pullPolicy: Always

Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/isindir.github.com_sopssecrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: sopssecrets.isindir.github.com
spec:
group: isindir.github.com
Expand Down
1 change: 0 additions & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: manager-role
rules:
- apiGroups:
Expand Down
Loading

0 comments on commit 0992896

Please sign in to comment.