Skip to content

Commit

Permalink
build: api, golang (#187)
Browse files Browse the repository at this point in the history
  • Loading branch information
isindir committed Aug 10, 2024
1 parent 3f5f14a commit 8aaf8bb
Show file tree
Hide file tree
Showing 15 changed files with 191 additions and 169 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.30.2-k3s2
K3S_VERSION: v1.30.3-k3s1
# https://github.com/helm-unittest/helm-unittest/releases
HELM_UNITTEST_VERSION: 0.5.1
HELM_UNITTEST_VERSION: 0.5.2

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 @@ -2,7 +2,7 @@
repos:
- repo: https://github.com/norwoodj/helm-docs
# https://github.com/norwoodj/helm-docs/releases
rev: v1.13.1
rev: v1.14.2
hooks:
- id: helm-docs
args:
Expand Down
18 changes: 9 additions & 9 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.1.0
kubebuilder 4.1.1
# https://golang.org/dl/
golang 1.22.5
golang 1.22.6
# https://github.com/mozilla/sops/releases
sops 3.9.0
# https://github.com/kubernetes-sigs/kustomize/releases
kustomize 5.4.2
kustomize 5.4.3
# https://github.com/rancher/k3d/releases
k3d 5.7.1
k3d 5.7.3
# https://github.com/kubernetes/kubernetes/releases
kubectl 1.30.2
kubectl 1.30.3
# https://github.com/helm/helm/releases
helm 3.15.2
helm 3.15.3
# https://github.com/norwoodj/helm-docs/releases
helm-docs 1.13.1
helm-docs 1.14.2
# https://github.com/yannh/kubeconform/releases
kubeconform 0.6.6
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.59.1
# https://github.com/cli/cli/releases
github-cli 2.52.0
github-cli 2.54.0
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# 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.13.2
SOPS_SEC_OPERATOR_VERSION := 0.13.3

# https://github.com/kubernetes-sigs/controller-tools/releases
CONTROLLER_GEN_VERSION := "v0.15.0"
# https://github.com/kubernetes-sigs/controller-runtime/releases
CONTROLLER_RUNTIME_VERSION := "v0.18.4"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION := "v5.4.2"
KUSTOMIZE_VERSION := "v5.4.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
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.30.x | v3.9.0 | 0.19.3 | 0.13.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 |
| 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.19.3
appVersion: 0.13.2
version: 0.19.4
appVersion: 0.13.3
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.30.2"
K8S_VERSION := "1.30.3"

SHELL=/bin/bash

Expand Down
3 changes: 2 additions & 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.13.2"` | Operator image tag |
| image.tag | string | `"0.13.3"` | 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 All @@ -146,6 +146,7 @@ The following table lists the configurable parameters of the Sops-secrets-operat
| logging.level | string | `"info"` | Zap Level to configure the verbosity of logging. Can be one of 'debug', 'info', 'error', or any integer value > 0 which corresponds to custom debug levels of increasing verbosity |
| logging.stacktraceLevel | string | `"error"` | Zap Level at and above which stacktraces are captured (one of 'info', 'error'). |
| logging.timeEncoding | string | `"iso8601"` | Zap time encoding (one of 'epoch', 'millis', 'nano', 'iso8601', 'rfc3339' or 'rfc3339nano'). Defaults to 'epoch'. |
| metrics.additionalLabels | object | `{}` | Additional labels for ServiceMonitor |
| metrics.enabled | bool | `false` | Enable prometheus metrics |
| nameOverride | string | `""` | Overrides auto-generated short resource name |
| namespaced | bool | `false` | If set - operator will watch SopsSecret resources only in operator namespace |
Expand Down
7 changes: 4 additions & 3 deletions chart/helm3/sops-secrets-operator/tests/monitor_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ tests:
of: monitoring.coreos.com/v1
- equal:
path: metadata.labels
# UPDATE_HERE
value:
app.kubernetes.io/instance: sops
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: sops-secrets-operator
app.kubernetes.io/version: "0.13.2"
helm.sh/chart: sops-secrets-operator-0.19.3
custom-label: custom-value
app.kubernetes.io/version: "0.13.3"
helm.sh/chart: sops-secrets-operator-0.19.4
custom-label: custom-value
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 @@ -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.13.2
helm.sh/chart: sops-secrets-operator-0.19.3
app.kubernetes.io/version: 0.13.3
helm.sh/chart: sops-secrets-operator-0.19.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.13.2
value: isindir/sops-secrets-operator:0.13.3
- 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 @@ -16,7 +16,7 @@ image:
# -- Operator image name
repository: isindir/sops-secrets-operator
# -- Operator image tag
tag: 0.13.2
tag: 0.13.3
# -- Operator image pull policy
pullPolicy: Always

Expand Down
Loading

0 comments on commit 8aaf8bb

Please sign in to comment.