Skip to content

Commit

Permalink
up: bump k8s version to 1.26.0 (#125)
Browse files Browse the repository at this point in the history
* up: bump k8s version to 1.26.0

* add helm package

* Fix typo

* Fix typo
  • Loading branch information
isindir authored Jan 6, 2023
1 parent e90ee89 commit 098e21c
Show file tree
Hide file tree
Showing 14 changed files with 193 additions and 179 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ jobs:
image: ubuntu-2204:2022.10.2
environment: &versions
# https://github.com/kubernetes/kubernetes/releases
KUBECTL_VERSION: v1.25.5
KUBECTL_VERSION: v1.26.0
# https://hub.docker.com/r/rancher/k3s/tags
K3S_VERSION: v1.25.4-k3s1
K3S_VERSION: v1.26.0-k3s1
# https://github.com/rancher/k3d/releases
K3D_VERSION: v5.4.6
# https://github.com/helm/helm/releases
HELM_VERSION: v3.10.2
HELM_VERSION: v3.10.3
# https://golang.org/dl/
GOLANG_VERSION: "1.19.4"
# https://github.com/kubernetes-sigs/kubebuilder/releases
KUBEBUILDER_VERSION: 3.7.0
KUBEBUILDER_VERSION: 3.8.0
# https://github.com/mozilla/sops/releases
SOPS_VERSION: v3.7.3
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION: v4.5.7
# https://github.com/quintush/helm-unittest/releases
HELM_UNITTEST_VERSION: 0.2.9
HELM_UNITTEST_VERSION: 0.2.10
# https://github.com/instrumenta/kubeval/releases
KUBEVAL_VERSION: 0.16.1
# https://github.com/github/hub/releases
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ kustomize 4.5.7
# https://github.com/rancher/k3d/releases
k3d 5.4.6
# https://github.com/kubernetes/kubernetes/releases
kubectl 1.25.5
kubectl 1.26.0
# https://github.com/helm/helm/releases
helm 3.10.2
helm 3.10.3
# https://github.com/norwoodj/helm-docs/releases
helm-docs 1.11.0
# https://github.com/instrumenta/kubeval/releases
Expand Down
8 changes: 4 additions & 4 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.6.4
SOPS_SEC_OPERATOR_VERSION := 0.7.0

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_GEN_VERSION := "v0.10.0"
CONTROLLER_GEN_VERSION := "v0.11.1"
# https://github.com/kubernetes-sigs/controller-runtime/releases
CONTROLLER_RUNTIME_VERSION := "v0.13.1"
CONTROLLER_RUNTIME_VERSION := "v0.14.1"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION := "v4.5.7"
# 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.25.0"
ENVTEST_K8S_VERSION := "1.26.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.26.x | v3.7.3 | 0.13.0 | 0.7.0 |
| v1.25.x | v3.7.3 | 0.12.5 | 0.6.4 |
| v1.24.x | v3.7.3 | 0.11.3 | 0.5.3 |
| v1.23.x | v3.7.2 | 0.10.8 | 0.4.8 |
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.12.5
appVersion: 0.6.4
version: 0.13.0
appVersion: 0.7.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.25.5"
K8S_VERSION := "1.26.0"

SHELL=/bin/bash

Expand Down
2 changes: 1 addition & 1 deletion chart/helm3/sops-secrets-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,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.6.4"` | Operator image tag |
| image.tag | string | `"0.7.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 |
Expand Down
6 changes: 3 additions & 3 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.6.4
helm.sh/chart: sops-secrets-operator-0.12.5
app.kubernetes.io/version: 0.7.0
helm.sh/chart: sops-secrets-operator-0.13.0

# 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.6.4
value: isindir/sops-secrets-operator:0.7.0
- equal:
path: spec.template.spec.containers[0].imagePullPolicy
value: Always
Expand Down
2 changes: 1 addition & 1 deletion 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.6.4
tag: 0.7.0
# -- Operator 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.10.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
name: sopssecrets.isindir.github.com
spec:
Expand Down
Loading

0 comments on commit 098e21c

Please sign in to comment.