diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a02e122..e0b25d7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,17 +19,17 @@ jobs: image: ubuntu-2204:2023.02.1 environment: &versions # https://github.com/kubernetes/kubernetes/releases - KUBECTL_VERSION: v1.27.2 + KUBECTL_VERSION: v1.27.3 # https://hub.docker.com/r/rancher/k3s/tags K3S_VERSION: v1.27.2-k3s1 # https://github.com/rancher/k3d/releases K3D_VERSION: v5.5.1 # https://github.com/helm/helm/releases - HELM_VERSION: v3.12.0 + HELM_VERSION: v3.12.1 # https://golang.org/dl/ - GOLANG_VERSION: "1.20.4" + GOLANG_VERSION: "1.20.5" # https://github.com/kubernetes-sigs/kubebuilder/releases - KUBEBUILDER_VERSION: 3.10.0 + KUBEBUILDER_VERSION: 3.11.0 # https://github.com/mozilla/sops/releases SOPS_VERSION: v3.7.3 # https://github.com/kubernetes-sigs/kustomize/releases @@ -43,7 +43,7 @@ jobs: # 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.5 + BUILDX_BINARY_VERSION: 0.11.0 DOCKER_BUILDKIT: 1 BUILDX_PLATFORMS: linux/amd64,linux/arm64 diff --git a/.tool-versions b/.tool-versions index ec2180cd..ca0e7c26 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,8 +1,8 @@ # UPDATE_HERE # https://github.com/kubernetes-sigs/kubebuilder/releases -kubebuilder 3.10.0 +kubebuilder 3.11.0 # https://golang.org/dl/ -golang 1.20.4 +golang 1.20.5 # https://github.com/mozilla/sops/releases sops 3.7.3 # https://github.com/kubernetes-sigs/kustomize/releases @@ -10,12 +10,13 @@ kustomize 5.0.3 # https://github.com/rancher/k3d/releases k3d 5.5.1 # https://github.com/kubernetes/kubernetes/releases -kubectl 1.27.2 +kubectl 1.27.3 # https://github.com/helm/helm/releases -helm 3.12.0 +helm 3.12.1 # https://github.com/norwoodj/helm-docs/releases helm-docs 1.11.0 # https://github.com/instrumenta/kubeval/releases kubeval v0.16.1 # https://github.com/git-chglog/git-chglog/releases git-chglog 0.15.4 +golangci-lint 1.53.3 diff --git a/Dockerfile b/Dockerfile index 983b0368..48a1beea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.4-bullseye as builder +FROM golang:1.20.5-bullseye as builder WORKDIR /workspace # Copy the Go Modules manifests @@ -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-20230425 +FROM ubuntu:jammy-20230605 RUN apt-get -y update \ && apt-get -y upgrade \ diff --git a/Makefile b/Makefile index 24c7cf1a..955b2737 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # UPDATE_HERE GO := GOPROXY=https://proxy.golang.org go -SOPS_SEC_OPERATOR_VERSION := 0.9.0 +SOPS_SEC_OPERATOR_VERSION := 0.9.1 # https://github.com/kubernetes-sigs/controller-tools/releases CONTROLLER_GEN_VERSION := "v0.12.0" @@ -100,6 +100,10 @@ test-helm: ## Tests helm chart. ##@ Development +.PHONY: lint +lint: ## Run golangci-lint + golangci-lint run --path-prefix=. --timeout 3m --verbose + .PHONY: update-here update-here: ## Helper target to start editing all occurances with UPDATE_HERE. @echo "Update following files for release:" diff --git a/README.md b/README.md index 3a91c50a..362025d6 100644 --- a/README.md +++ b/README.md @@ -23,7 +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.27.x | v3.7.3 | 0.15.1 | 0.9.1 | | 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 | diff --git a/chart/helm3/sops-secrets-operator/Chart.yaml b/chart/helm3/sops-secrets-operator/Chart.yaml index 2db872bf..b836b236 100644 --- a/chart/helm3/sops-secrets-operator/Chart.yaml +++ b/chart/helm3/sops-secrets-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 # UPDATE_HERE -version: 0.15.0 -appVersion: 0.9.0 +version: 0.15.1 +appVersion: 0.9.1 type: application description: Helm chart deploys sops-secrets-operator name: sops-secrets-operator diff --git a/chart/helm3/sops-secrets-operator/README.md b/chart/helm3/sops-secrets-operator/README.md index 2fca0581..254d02d6 100644 --- a/chart/helm3/sops-secrets-operator/README.md +++ b/chart/helm3/sops-secrets-operator/README.md @@ -134,16 +134,18 @@ 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.9.0"` | Operator image tag | +| image.tag | string | `"0.9.1"` | 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-20230425"` | Init container image tag | +| initImage.tag | string | `"jammy-20230605"` | 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 | 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 | | logging.encoder | string | `"json"` | Zap log encoding (one of 'json' or 'console') | | 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.enabled | bool | `false` | Enable prometheus metrics | | nameOverride | string | `""` | Overrides auto-generated short resource name | | nodeSelector | object | `{}` | Node selector to use for pod configuration | diff --git a/chart/helm3/sops-secrets-operator/templates/operator.yaml b/chart/helm3/sops-secrets-operator/templates/operator.yaml index f0b770f1..485113a9 100644 --- a/chart/helm3/sops-secrets-operator/templates/operator.yaml +++ b/chart/helm3/sops-secrets-operator/templates/operator.yaml @@ -70,16 +70,18 @@ spec: - /usr/local/bin/manager args: # The address the metric endpoint binds to. (default ":8080") - #- "--metrics-bind-address=127.0.0.1:8080" - - "--health-probe-bind-address=:{{ .Values.healthProbes.port }}" + #- "-metrics-bind-address=127.0.0.1:8080" + - "-health-probe-bind-address=:{{ .Values.healthProbes.port }}" # Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager. - - "--leader-elect" - - "--requeue-decrypt-after={{ .Values.requeueAfter }}" - - "--zap-encoder={{ .Values.logging.encoder }}" - - "--zap-log-level={{ .Values.logging.level }}" - - "--zap-stacktrace-level={{ .Values.logging.stacktraceLevel }}" + - "-leader-elect" + - "-requeue-decrypt-after={{ .Values.requeueAfter }}" + - "-zap-devel={{ .Values.logging.development }}" + - "-zap-encoder={{ .Values.logging.encoder }}" + - "-zap-log-level={{ .Values.logging.level }}" + - "-zap-stacktrace-level={{ .Values.logging.stacktraceLevel }}" + - "-zap-time-encoding={{ .Values.logging.timeEncoding }}" {{- if .Values.kubeconfig.enabled }} - - "--kubeconfig={{ .Values.kubeconfig.path | quote }}" + - "-kubeconfig={{ .Values.kubeconfig.path | quote }}" {{- end }} livenessProbe: httpGet: diff --git a/chart/helm3/sops-secrets-operator/tests/operator_test.yaml b/chart/helm3/sops-secrets-operator/tests/operator_test.yaml index f56d9f5e..7cd060b6 100644 --- a/chart/helm3/sops-secrets-operator/tests/operator_test.yaml +++ b/chart/helm3/sops-secrets-operator/tests/operator_test.yaml @@ -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.9.0 - helm.sh/chart: sops-secrets-operator-0.15.0 + app.kubernetes.io/version: 0.9.1 + helm.sh/chart: sops-secrets-operator-0.15.1 # custom name - it: should correctly render custome name @@ -170,7 +170,7 @@ tests: # UPDATE_HERE - equal: path: spec.template.spec.containers[0].image - value: isindir/sops-secrets-operator:0.9.0 + value: isindir/sops-secrets-operator:0.9.1 - equal: path: spec.template.spec.containers[0].imagePullPolicy value: Always @@ -198,7 +198,7 @@ tests: - equal: path: spec.template.spec.initContainers[0].image # UPDATE_HERE - value: ubuntu:jammy-20230425 + value: ubuntu:jammy-20230605 - equal: path: spec.template.spec.initContainers[0].imagePullPolicy value: Always diff --git a/chart/helm3/sops-secrets-operator/values.yaml b/chart/helm3/sops-secrets-operator/values.yaml index 5bc4a45b..c4fa0e94 100644 --- a/chart/helm3/sops-secrets-operator/values.yaml +++ b/chart/helm3/sops-secrets-operator/values.yaml @@ -13,7 +13,7 @@ image: # -- Operator image name repository: isindir/sops-secrets-operator # -- Operator image tag - tag: 0.9.0 + tag: 0.9.1 # -- Operator image pull policy pullPolicy: Always @@ -22,11 +22,10 @@ initImage: # -- Init container image name repository: ubuntu # -- Init container image tag - tag: jammy-20230425 + tag: jammy-20230605 # -- Init container image pull policy pullPolicy: Always - # -- Secrets to pull image from private docker repository imagePullSecrets: [] # -- Overrides auto-generated short resource name @@ -53,12 +52,16 @@ kubeconfig: # Development Mode (encoder=consoleEncoder,logLevel=Debug,stackTraceLevel=Warn). # Production Mode (encoder=jsonEncoder,logLevel=Info,stackTraceLevel=Error) (default) logging: + # -- Zap Development Mode enabled + development: false # -- Zap log encoding (one of 'json' or 'console') encoder: json # -- 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 level: info # -- Zap Level at and above which stacktraces are captured (one of 'info', 'error'). stacktraceLevel: error + # -- Zap time encoding (one of 'epoch', 'millis', 'nano', 'iso8601', 'rfc3339' or 'rfc3339nano'). Defaults to 'epoch'. + timeEncoding: iso8601 healthProbes: # -- The address the probe endpoint binds to. (default ":8081") diff --git a/cmd/main.go b/cmd/main.go index 147bca50..1024b206 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -54,9 +54,11 @@ func main() { "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") flag.Int64Var(&requeueAfter, "requeue-decrypt-after", 5, "Requeue failed reconciliation in minutes (min 1).") + opts := zap.Options{ Development: true, } + opts.BindFlags(flag.CommandLine) flag.Parse() @@ -78,7 +80,8 @@ func main() { if requeueAfter < 1 { requeueAfter = 1 } - setupLog.Info( + + setupLog.V(0).Info( fmt.Sprintf( "SopsSecret reconciliation will be requeued after %d minutes after decryption failures", requeueAfter, diff --git a/docs/index.yaml b/docs/index.yaml index d378088f..f7b0119e 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -1,9 +1,29 @@ apiVersion: v1 entries: sops-secrets-operator: + - apiVersion: v2 + appVersion: 0.9.1 + created: "2023-06-25T13:06:52.301242+01:00" + description: Helm chart deploys sops-secrets-operator + digest: a66730e0b5c98a4f9bbd2a37389ef0f0df7545e90467575f87280f6c5c550692 + keywords: + - gitops + - sops + - kms + - encryption + maintainers: + - email: isindir@users.sf.net + name: isindir + name: sops-secrets-operator + sources: + - https://github.com/isindir/sops-secrets-operator.git + type: application + urls: + - https://isindir.github.io/sops-secrets-operator/sops-secrets-operator-0.15.1.tgz + version: 0.15.1 - apiVersion: v2 appVersion: 0.9.0 - created: "2023-05-29T22:41:52.176751+01:00" + created: "2023-06-25T13:06:52.300815+01:00" description: Helm chart deploys sops-secrets-operator digest: 9e9c728e2f57e9f3c0fed7d6736bdcf27e997ab7a80fd4357088699710ab5155 keywords: @@ -23,7 +43,7 @@ entries: version: 0.15.0 - apiVersion: v2 appVersion: 0.8.2 - created: "2023-05-29T22:41:52.176383+01:00" + created: "2023-06-25T13:06:52.300266+01:00" description: Helm chart deploys sops-secrets-operator digest: 03f041d0685f3e0a5fab8967a48238c8ff127700cba5da21efbe0cf13ca3874a keywords: @@ -43,7 +63,7 @@ entries: version: 0.14.2 - apiVersion: v2 appVersion: 0.8.1 - created: "2023-05-29T22:41:52.17601+01:00" + created: "2023-06-25T13:06:52.299673+01:00" description: Helm chart deploys sops-secrets-operator digest: 3aa754eddca4678191f2e2207936d35930650c7840c76e268802f3344589874b keywords: @@ -63,7 +83,7 @@ entries: version: 0.14.1 - apiVersion: v2 appVersion: 0.8.0 - created: "2023-05-29T22:41:52.175636+01:00" + created: "2023-06-25T13:06:52.299073+01:00" description: Helm chart deploys sops-secrets-operator digest: 4628acf98a445fb2d7884b1b1f2a452b845119082d4e338bdf9a4b7fc18d3f2a keywords: @@ -83,7 +103,7 @@ entries: version: 0.14.0 - apiVersion: v2 appVersion: 0.7.2 - created: "2023-05-29T22:41:52.175074+01:00" + created: "2023-06-25T13:06:52.298542+01:00" description: Helm chart deploys sops-secrets-operator digest: 8520815ba31b82d2caeb8d774268ec73f3bb0103e3781be6f2e0fbaa1b06c73c keywords: @@ -103,7 +123,7 @@ entries: version: 0.13.2 - apiVersion: v2 appVersion: 0.7.1 - created: "2023-05-29T22:41:52.174338+01:00" + created: "2023-06-25T13:06:52.297877+01:00" description: Helm chart deploys sops-secrets-operator digest: 9eee5e092a6cde86312ce9adbe48a102086370e39190a90147ed93563436b523 keywords: @@ -123,7 +143,7 @@ entries: version: 0.13.1 - apiVersion: v2 appVersion: 0.7.0 - created: "2023-05-29T22:41:52.173999+01:00" + created: "2023-06-25T13:06:52.297194+01:00" description: Helm chart deploys sops-secrets-operator digest: d45c9712aab117160235abebd33236b4257d52a6d1e6ec160ce15caa27a4065e keywords: @@ -143,7 +163,7 @@ entries: version: 0.13.0 - apiVersion: v2 appVersion: 0.6.4 - created: "2023-05-29T22:41:52.173658+01:00" + created: "2023-06-25T13:06:52.296784+01:00" description: Helm chart deploys sops-secrets-operator digest: 4aef82a20dd55cebcdd048f78d8f2aaec1e2fe758f26702ed1ce685fac46bb14 keywords: @@ -163,7 +183,7 @@ entries: version: 0.12.5 - apiVersion: v2 appVersion: 0.6.3 - created: "2023-05-29T22:41:52.173313+01:00" + created: "2023-06-25T13:06:52.296391+01:00" description: Helm chart deploys sops-secrets-operator digest: 84ffa14c8e3f77cfb7d9d79c481af6536bc192a035764becbda1fea5a0640053 keywords: @@ -183,7 +203,7 @@ entries: version: 0.12.4 - apiVersion: v2 appVersion: 0.6.2 - created: "2023-05-29T22:41:52.172971+01:00" + created: "2023-06-25T13:06:52.295962+01:00" description: Helm chart deploys sops-secrets-operator digest: 57aa897deb1b80d2b4e73b693d253871c600838b169ffbc0dc8e7738d8d9d86c keywords: @@ -203,7 +223,7 @@ entries: version: 0.12.3 - apiVersion: v2 appVersion: 0.6.2 - created: "2023-05-29T22:41:52.172629+01:00" + created: "2023-06-25T13:06:52.295415+01:00" description: Helm chart deploys sops-secrets-operator digest: bc22299e9f8a6aad73d20e1ba2461c480935b85a2ff51d4a00016b8de78c04b6 keywords: @@ -223,7 +243,7 @@ entries: version: 0.12.2 - apiVersion: v2 appVersion: 0.6.1 - created: "2023-05-29T22:41:52.172291+01:00" + created: "2023-06-25T13:06:52.295027+01:00" description: Helm chart deploys sops-secrets-operator digest: 06e31ab09ada6321d2dc4cc85418910398ea2a4811380cd81b717683be445613 keywords: @@ -243,7 +263,7 @@ entries: version: 0.12.1 - apiVersion: v2 appVersion: 0.6.0 - created: "2023-05-29T22:41:52.17195+01:00" + created: "2023-06-25T13:06:52.294638+01:00" description: Helm chart deploys sops-secrets-operator digest: 086103226c9292634e5d53b112b69e2546b7b1e6334d86dc2f1d0a77605ee910 keywords: @@ -263,7 +283,7 @@ entries: version: 0.12.0 - apiVersion: v2 appVersion: 0.5.3 - created: "2023-05-29T22:41:52.171564+01:00" + created: "2023-06-25T13:06:52.294219+01:00" description: Helm chart deploys sops-secrets-operator digest: 3545eae02b2d55ed907f537cc5efb4da164e752de3f38f973a8e698d20c5cac0 keywords: @@ -283,7 +303,7 @@ entries: version: 0.11.3 - apiVersion: v2 appVersion: 0.5.2 - created: "2023-05-29T22:41:52.171185+01:00" + created: "2023-06-25T13:06:52.293785+01:00" description: Helm chart deploys sops-secrets-operator digest: 1ce69fc85fbffac3d7151f22fbfc26788531a15f663203b6003c5494613e7910 keywords: @@ -303,7 +323,7 @@ entries: version: 0.11.2 - apiVersion: v2 appVersion: 0.5.1 - created: "2023-05-29T22:41:52.170815+01:00" + created: "2023-06-25T13:06:52.293363+01:00" description: Helm chart deploys sops-secrets-operator digest: 1c9da3867e1b4d0d0f6304f3ac128f0de8cd7bd9cfcce9604ea31c6705d7bd53 keywords: @@ -323,7 +343,7 @@ entries: version: 0.11.1 - apiVersion: v2 appVersion: 0.5.0 - created: "2023-05-29T22:41:52.169489+01:00" + created: "2023-06-25T13:06:52.292953+01:00" description: Helm chart deploys sops-secrets-operator digest: 1dc29756e76f909b4d48e27f5b451ef4deadc68a8de359a32cfdc87f508ad841 keywords: @@ -343,7 +363,7 @@ entries: version: 0.11.0 - apiVersion: v2 appVersion: 0.4.8 - created: "2023-05-29T22:41:52.169123+01:00" + created: "2023-06-25T13:06:52.292464+01:00" description: Helm chart deploys sops-secrets-operator digest: 54e2053fffcb019b86cb7c21884f7034a4efc895eec545105114b0848eec638a keywords: @@ -363,7 +383,7 @@ entries: version: 0.10.8 - apiVersion: v2 appVersion: 0.4.7 - created: "2023-05-29T22:41:52.168763+01:00" + created: "2023-06-25T13:06:52.291317+01:00" description: Helm chart deploys sops-secrets-operator digest: b7b04cd673ca2a781b47a656ea2e3e69957d6243a5151d36b341686a79b8abda keywords: @@ -383,7 +403,7 @@ entries: version: 0.10.7 - apiVersion: v2 appVersion: 0.4.6 - created: "2023-05-29T22:41:52.168409+01:00" + created: "2023-06-25T13:06:52.29092+01:00" description: Helm chart deploys sops-secrets-operator digest: 8e580ee17f943fa52a3bd06f9a7f2236b4b19dd6c85cfea6593a4fa18513ba52 keywords: @@ -403,7 +423,7 @@ entries: version: 0.10.6 - apiVersion: v2 appVersion: 0.4.5 - created: "2023-05-29T22:41:52.168028+01:00" + created: "2023-06-25T13:06:52.290498+01:00" description: Helm chart deploys sops-secrets-operator digest: 0e05931586ea4d2c81b6e00849addb8430e2923f70b2aed08bfd5a733dcf09d0 keywords: @@ -423,7 +443,7 @@ entries: version: 0.10.5 - apiVersion: v2 appVersion: 0.4.4 - created: "2023-05-29T22:41:52.167687+01:00" + created: "2023-06-25T13:06:52.290053+01:00" description: Helm chart deploys sops-secrets-operator digest: 606a826ae48759b4bb305a3fd3200342aa5b1bd1ab1afac9315f4a25a6184758 keywords: @@ -443,7 +463,7 @@ entries: version: 0.10.4 - apiVersion: v2 appVersion: 0.4.3 - created: "2023-05-29T22:41:52.167334+01:00" + created: "2023-06-25T13:06:52.289646+01:00" description: Helm chart deploys sops-secrets-operator digest: b329233d4fccf2d5377e1988b6e1858e1c69786e79fb56ce0b0cf65439f3228b keywords: @@ -463,7 +483,7 @@ entries: version: 0.10.3 - apiVersion: v2 appVersion: 0.4.2 - created: "2023-05-29T22:41:52.166938+01:00" + created: "2023-06-25T13:06:52.289262+01:00" description: Helm chart deploys sops-secrets-operator digest: d4ab3300dee58d2661db327cf205e821158cdae1bff032c3511d58f3ed97802b keywords: @@ -483,7 +503,7 @@ entries: version: 0.10.2 - apiVersion: v2 appVersion: 0.4.1 - created: "2023-05-29T22:41:52.166588+01:00" + created: "2023-06-25T13:06:52.288391+01:00" description: Helm chart deploys sops-secrets-operator digest: 7f7da6232c02453208b19d737d6b0fad795c3a0c7962efba092367f9827190a1 keywords: @@ -503,7 +523,7 @@ entries: version: 0.10.1 - apiVersion: v2 appVersion: 0.4.0 - created: "2023-05-29T22:41:52.166236+01:00" + created: "2023-06-25T13:06:52.28782+01:00" description: Helm chart deploys sops-secrets-operator digest: 35f3813680049bb629ad53be826418e524ca84845f690d4957fd8ee3533a4b32 keywords: @@ -523,7 +543,7 @@ entries: version: 0.10.0 - apiVersion: v2 appVersion: 0.3.7 - created: "2023-05-29T22:41:52.191425+01:00" + created: "2023-06-25T13:06:52.319632+01:00" description: Helm chart deploys sops-secrets-operator digest: 222eeff7f68ed50aa3ef0281b730d530b6bea56598fd3aa432c41e76ea42af20 keywords: @@ -543,7 +563,7 @@ entries: version: 0.9.7 - apiVersion: v2 appVersion: 0.3.6 - created: "2023-05-29T22:41:52.191073+01:00" + created: "2023-06-25T13:06:52.319236+01:00" description: Helm chart deploys sops-secrets-operator digest: b4f8fe41e191f51833c4af0299fc6c2c554b04228ece8ce019015b4166d06468 keywords: @@ -563,7 +583,7 @@ entries: version: 0.9.6 - apiVersion: v2 appVersion: 0.3.5 - created: "2023-05-29T22:41:52.190717+01:00" + created: "2023-06-25T13:06:52.318845+01:00" description: Helm chart deploys sops-secrets-operator digest: 7ab3970270bb4fed2f7fc7c434ad5548f4af8d1e0aa29b8985e46bcdc805f4d2 keywords: @@ -583,7 +603,7 @@ entries: version: 0.9.5 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-05-29T22:41:52.190385+01:00" + created: "2023-06-25T13:06:52.31848+01:00" description: Helm chart deploys sops-secrets-operator digest: 69bc585f2d67a7658f65c184f1522810d5d18f72ed52886fc8c211cc3bd79678 keywords: @@ -603,7 +623,7 @@ entries: version: 0.9.4 - apiVersion: v2 appVersion: 0.3.3 - created: "2023-05-29T22:41:52.19004+01:00" + created: "2023-06-25T13:06:52.318087+01:00" description: Helm chart deploys sops-secrets-operator digest: 4c45b12d750f8f846304c579c428c1e5b84a8fd45033cb84ce607f1437bdc71a keywords: @@ -623,7 +643,7 @@ entries: version: 0.9.3 - apiVersion: v2 appVersion: 0.3.2 - created: "2023-05-29T22:41:52.189698+01:00" + created: "2023-06-25T13:06:52.317693+01:00" description: Helm chart deploys sops-secrets-operator digest: dbec66ae148cd665612f9b69e0dd139264c47744c797cf504a26556c77ae2130 keywords: @@ -643,7 +663,7 @@ entries: version: 0.9.2 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-05-29T22:41:52.189327+01:00" + created: "2023-06-25T13:06:52.317291+01:00" description: Helm chart deploys sops-secrets-operator digest: 6228534471c0bab5eca824d98963adce99d4754bf03f37130529ac52536c79ad keywords: @@ -663,7 +683,7 @@ entries: version: 0.9.1 - apiVersion: v2 appVersion: 0.3.0 - created: "2023-05-29T22:41:52.188923+01:00" + created: "2023-06-25T13:06:52.316901+01:00" description: Helm chart deploys sops-secrets-operator digest: b7f077f8acac1b6ec60d0c0eb6326ab33cf3e4b9fb1ee8d94b1fa21f96aa7383 keywords: @@ -683,7 +703,7 @@ entries: version: 0.9.0 - apiVersion: v2 appVersion: 0.2.2 - created: "2023-05-29T22:41:52.188313+01:00" + created: "2023-06-25T13:06:52.31647+01:00" description: Helm chart deploys sops-secrets-operator digest: 39d3d35a28a405e7baf82d507fa642966c2705ac3ca2f10077186a7fec5de1f6 keywords: @@ -703,7 +723,7 @@ entries: version: 0.8.4 - apiVersion: v2 appVersion: 0.2.1 - created: "2023-05-29T22:41:52.187994+01:00" + created: "2023-06-25T13:06:52.315956+01:00" description: Helm chart deploys sops-secrets-operator digest: 4a1a3299532a4ec61acb61db45d763385bc3c2bd50c9c1707e3ba258498b5ee5 keywords: @@ -723,7 +743,7 @@ entries: version: 0.8.3 - apiVersion: v2 appVersion: 0.2.1 - created: "2023-05-29T22:41:52.187674+01:00" + created: "2023-06-25T13:06:52.315237+01:00" description: Helm chart deploys sops-secrets-operator digest: d328b4e165c3945430e196a853836dcee9982929fe24455021ddb885099d5334 keywords: @@ -743,7 +763,7 @@ entries: version: 0.8.2 - apiVersion: v2 appVersion: 0.2.0 - created: "2023-05-29T22:41:52.187354+01:00" + created: "2023-06-25T13:06:52.314717+01:00" description: Helm chart deploys sops-secrets-operator digest: d0ac8b738d0f10d64b2fb78c4386efe91de39aa88a4b107fdf9d93a82d18573c keywords: @@ -763,7 +783,7 @@ entries: version: 0.8.1 - apiVersion: v2 appVersion: 0.2.0 - created: "2023-05-29T22:41:52.187028+01:00" + created: "2023-06-25T13:06:52.314344+01:00" description: Helm chart deploys sops-secrets-operator digest: 289d7c6c96f858fe15427b1858fbfcdec373fc345acf52e667df4ca5ee729c10 keywords: @@ -783,7 +803,7 @@ entries: version: 0.8.0 - apiVersion: v2 appVersion: 0.1.17 - created: "2023-05-29T22:41:52.186693+01:00" + created: "2023-06-25T13:06:52.313976+01:00" description: sops secrets operator digest: 1c3c4bba7d66a7621beced04856d9904260558fe10369513743bc322d69482c1 keywords: @@ -803,7 +823,7 @@ entries: version: 0.7.6 - apiVersion: v2 appVersion: 0.1.16 - created: "2023-05-29T22:41:52.186403+01:00" + created: "2023-06-25T13:06:52.313491+01:00" description: sops secrets operator digest: c526d5d4b9c7c2cce1d9da2c75b4e9be7a994f24dce159a659189414a8725eae keywords: @@ -823,7 +843,7 @@ entries: version: 0.7.5 - apiVersion: v2 appVersion: 0.1.16 - created: "2023-05-29T22:41:52.186116+01:00" + created: "2023-06-25T13:06:52.313022+01:00" description: sops secrets operator digest: 572c9015988b76869b58997e02a0c64152283e559721e4883d54f1258a57e8b7 keywords: @@ -843,7 +863,7 @@ entries: version: 0.7.4 - apiVersion: v2 appVersion: 0.1.15 - created: "2023-05-29T22:41:52.185827+01:00" + created: "2023-06-25T13:06:52.312691+01:00" description: sops secrets operator digest: 84365f8e919ba9d3a00cfa50435cce6c63a8383357b2fde062b7aab8baeca6eb keywords: @@ -863,7 +883,7 @@ entries: version: 0.7.3 - apiVersion: v2 appVersion: 0.1.14 - created: "2023-05-29T22:41:52.185539+01:00" + created: "2023-06-25T13:06:52.312371+01:00" description: sops secrets operator digest: a1f2375080df20421701a33179b8e947ee682a70084d83d85da707889871ad64 keywords: @@ -883,7 +903,7 @@ entries: version: 0.7.2 - apiVersion: v2 appVersion: 0.1.13 - created: "2023-05-29T22:41:52.185252+01:00" + created: "2023-06-25T13:06:52.312051+01:00" description: sops secrets operator digest: 2e81dc4e4d49d9cd802aff263f005e04fb57df07f33b3ce8643ab287dfd3a7fb keywords: @@ -903,7 +923,7 @@ entries: version: 0.7.1 - apiVersion: v2 appVersion: 0.1.12 - created: "2023-05-29T22:41:52.184953+01:00" + created: "2023-06-25T13:06:52.311729+01:00" description: sops secrets operator digest: 81f59ed60bfa8204ed285476f9ed96a45a6f4e7cc6940a5d246c9241573d93d5 keywords: @@ -923,7 +943,7 @@ entries: version: 0.7.0 - apiVersion: v2 appVersion: 0.1.12 - created: "2023-05-29T22:41:52.184611+01:00" + created: "2023-06-25T13:06:52.3114+01:00" description: sops secrets operator digest: 91c3fbda73ba2d860bdaa21e37bf9afbc260ff767b377a144d0181d116a7ee34 keywords: @@ -943,7 +963,7 @@ entries: version: 0.6.8 - apiVersion: v2 appVersion: 0.1.12 - created: "2023-05-29T22:41:52.184214+01:00" + created: "2023-06-25T13:06:52.311066+01:00" description: sops secrets operator digest: 89d9d41d70d4dafcfb957bd48776ad779d0cef7dbb1ab2daf0b745a53dd6e3c6 maintainers: @@ -958,7 +978,7 @@ entries: version: 0.6.7 - apiVersion: v2 appVersion: 0.1.11 - created: "2023-05-29T22:41:52.183489+01:00" + created: "2023-06-25T13:06:52.310716+01:00" description: sops secrets operator digest: 7b0a65fd6fa9bafa3fd11bfef1a5f91f1e17d8cb8ad65b6377ffdc4d12495d01 maintainers: @@ -973,7 +993,7 @@ entries: version: 0.6.6 - apiVersion: v2 appVersion: 0.1.10 - created: "2023-05-29T22:41:52.183208+01:00" + created: "2023-06-25T13:06:52.310347+01:00" description: sops secrets operator digest: fac31d6cc862cb7b9a81aee52ba1fc4183d70bdcb7424c3dbdd087fb53246b30 maintainers: @@ -988,7 +1008,7 @@ entries: version: 0.6.5 - apiVersion: v2 appVersion: 0.1.9 - created: "2023-05-29T22:41:52.182928+01:00" + created: "2023-06-25T13:06:52.309708+01:00" description: sops secrets operator digest: 01347c27e37dfff999ebcee12aae6d0aafa092d7c3b221d566cdf0abe71f4d5a maintainers: @@ -1003,7 +1023,7 @@ entries: version: 0.6.4 - apiVersion: v2 appVersion: 0.1.8 - created: "2023-05-29T22:41:52.182655+01:00" + created: "2023-06-25T13:06:52.309381+01:00" description: sops secrets operator digest: 6348b1b1b0e8d3df3926e437b2c0f4ad63268d26e2cb54cbecbb564102e6b19c maintainers: @@ -1018,7 +1038,7 @@ entries: version: 0.6.3 - apiVersion: v2 appVersion: 0.1.7 - created: "2023-05-29T22:41:52.182402+01:00" + created: "2023-06-25T13:06:52.308014+01:00" description: sops secrets operator digest: 710c1c9fa73a2ebf791fda4a608b5e29072d42c0b68c803c7bbeed54a582fd7f maintainers: @@ -1033,7 +1053,7 @@ entries: version: 0.6.2 - apiVersion: v2 appVersion: 0.1.7 - created: "2023-05-29T22:41:52.182135+01:00" + created: "2023-06-25T13:06:52.307722+01:00" description: sops secrets operator digest: f2a606c3837843241bb9d59adc02c38e1cca98753c602b9f758cc61d735ca7cd maintainers: @@ -1048,7 +1068,7 @@ entries: version: 0.6.1 - apiVersion: v2 appVersion: 0.1.6 - created: "2023-05-29T22:41:52.181865+01:00" + created: "2023-06-25T13:06:52.307434+01:00" description: sops secrets operator digest: a2bbf9b39ec5f5b82965037f8f245fb3122adbe31b1c7d336fa1f4cddb228b88 maintainers: @@ -1063,7 +1083,7 @@ entries: version: 0.6.0 - apiVersion: v1 appVersion: 0.1.8 - created: "2023-05-29T22:41:52.181607+01:00" + created: "2023-06-25T13:06:52.307137+01:00" description: sops secrets operator digest: b89986787f33bb6ed9fb0c658431be8646302e9c1a24537c26269c62249fa071 maintainers: @@ -1077,7 +1097,7 @@ entries: version: 0.5.3 - apiVersion: v1 appVersion: 0.1.7 - created: "2023-05-29T22:41:52.181382+01:00" + created: "2023-06-25T13:06:52.306894+01:00" description: sops secrets operator digest: 9467709cf6fbe8d9d779cedf15fe388af172b609f3ca452ef3d8894f39d999df maintainers: @@ -1091,7 +1111,7 @@ entries: version: 0.5.2 - apiVersion: v1 appVersion: 0.1.7 - created: "2023-05-29T22:41:52.181162+01:00" + created: "2023-06-25T13:06:52.306646+01:00" description: sops secrets operator digest: b54b5d8497564ddc04bd6d8b105eb0a3559e82ae1f6aab2f59ed3e426f119287 maintainers: @@ -1105,7 +1125,7 @@ entries: version: 0.5.1 - apiVersion: v1 appVersion: 0.1.6 - created: "2023-05-29T22:41:52.180942+01:00" + created: "2023-06-25T13:06:52.306408+01:00" description: sops secrets operator digest: 177f1ed214d6e72eda589a6ab155a417c1a4229bfda11e87f24af125a3542ad1 maintainers: @@ -1119,7 +1139,7 @@ entries: version: 0.5.0 - apiVersion: v2 appVersion: 0.1.5 - created: "2023-05-29T22:41:52.180724+01:00" + created: "2023-06-25T13:06:52.306157+01:00" description: sops secrets operator digest: 1535e130357afa883db0b3d30735c817d3b7d412fe5bdfd71534d0c08defa7d1 maintainers: @@ -1134,7 +1154,7 @@ entries: version: 0.4.8 - apiVersion: v2 appVersion: 0.1.5 - created: "2023-05-29T22:41:52.180468+01:00" + created: "2023-06-25T13:06:52.305869+01:00" description: sops secrets operator digest: 19b11dc2d1945f3c436a7d03763b4391d4a382fc13ea515d25422827d859d6d0 maintainers: @@ -1149,7 +1169,7 @@ entries: version: 0.4.7 - apiVersion: v2 appVersion: 0.1.5 - created: "2023-05-29T22:41:52.180249+01:00" + created: "2023-06-25T13:06:52.305639+01:00" description: sops secrets operator digest: c839e5d3374b948d27ad49643411f4891fdec44d179dea06423bb0d6e29d5e32 maintainers: @@ -1164,7 +1184,7 @@ entries: version: 0.4.6 - apiVersion: v2 appVersion: 0.1.4 - created: "2023-05-29T22:41:52.180012+01:00" + created: "2023-06-25T13:06:52.305394+01:00" description: sops secrets operator digest: c71f9f66be32f8b9d3c8d780b09b2455a40fd9755314004efd2bb8d379dafe3c maintainers: @@ -1179,7 +1199,7 @@ entries: version: 0.4.5 - apiVersion: v2 appVersion: 0.1.3 - created: "2023-05-29T22:41:52.179757+01:00" + created: "2023-06-25T13:06:52.305164+01:00" description: sops secrets operator digest: f3f2f89d4ef6018776df0a12a63dd2f9c9519b9d1ac03a9a405e31d0fd902ba0 maintainers: @@ -1194,7 +1214,7 @@ entries: version: 0.4.4 - apiVersion: v2 appVersion: 0.1.2 - created: "2023-05-29T22:41:52.179257+01:00" + created: "2023-06-25T13:06:52.304942+01:00" description: sops secrets operator digest: 1fd5eed318627f5ed0656f4e8ce4a25729568a1626ae313bcbe21050f5f26240 maintainers: @@ -1209,7 +1229,7 @@ entries: version: 0.4.3 - apiVersion: v2 appVersion: 0.1.2 - created: "2023-05-29T22:41:52.17907+01:00" + created: "2023-06-25T13:06:52.304714+01:00" description: sops secrets operator digest: 1f4f9869c75f0922e83ba5d530e101bd4252d5c1c31365800cc9d1425680cf18 maintainers: @@ -1224,7 +1244,7 @@ entries: version: 0.4.2 - apiVersion: v2 appVersion: 0.1.1 - created: "2023-05-29T22:41:52.178884+01:00" + created: "2023-06-25T13:06:52.304491+01:00" description: sops secrets operator digest: 6b054a4e9f261eea3cb84ee2e70b87b24780f1703e2c218ea5f69b7f82d1876f maintainers: @@ -1239,7 +1259,7 @@ entries: version: 0.4.1 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-05-29T22:41:52.178705+01:00" + created: "2023-06-25T13:06:52.304113+01:00" description: sops secrets operator digest: 78b62ab37eac1b45f0a68a9752a3615c5d3f1c960bb4057e665923ce104931cf maintainers: @@ -1254,7 +1274,7 @@ entries: version: 0.4.0 - apiVersion: v1 appVersion: 0.1.5 - created: "2023-05-29T22:41:52.178524+01:00" + created: "2023-06-25T13:06:52.303617+01:00" description: sops secrets operator digest: 41baa3c580cb9d8951c18513a4f04c4dbbfad99de9c62f53de2450c0c7b76725 maintainers: @@ -1268,7 +1288,7 @@ entries: version: 0.3.7 - apiVersion: v1 appVersion: 0.1.5 - created: "2023-05-29T22:41:52.1783+01:00" + created: "2023-06-25T13:06:52.303368+01:00" description: sops secrets operator digest: 1103b1f7bf7af3f400c172227cd5a3659f3a03e5e8158b19ba0b25f7ed45208b maintainers: @@ -1282,7 +1302,7 @@ entries: version: 0.3.6 - apiVersion: v1 appVersion: 0.1.5 - created: "2023-05-29T22:41:52.178092+01:00" + created: "2023-06-25T13:06:52.303158+01:00" description: sops secrets operator digest: 15c72ba7fb09d0e980ec32fd94f56893c439c05c435281a9ab9c8bc94bd20063 maintainers: @@ -1296,7 +1316,7 @@ entries: version: 0.3.5 - apiVersion: v1 appVersion: 0.1.4 - created: "2023-05-29T22:41:52.177888+01:00" + created: "2023-06-25T13:06:52.302944+01:00" description: sops secrets operator digest: 025a6a6381b75286756ef55105ace6e911e5a5818b495ede6356cc8ec572aeac maintainers: @@ -1310,7 +1330,7 @@ entries: version: 0.3.4 - apiVersion: v1 appVersion: 0.1.3 - created: "2023-05-29T22:41:52.177694+01:00" + created: "2023-06-25T13:06:52.302742+01:00" description: sops secrets operator digest: f61b070b640169439cf4ab500047c1e356748a85871f7aeefde46d63d87d453a maintainers: @@ -1324,7 +1344,7 @@ entries: version: 0.3.3 - apiVersion: v1 appVersion: 0.1.2 - created: "2023-05-29T22:41:52.177506+01:00" + created: "2023-06-25T13:06:52.302533+01:00" description: sops secrets operator digest: 2b37dc4e545e8a9540f6b7693079b98bf161ec5a68899defcfc9420bdcbb33e3 maintainers: @@ -1338,7 +1358,7 @@ entries: version: 0.3.2 - apiVersion: v1 appVersion: 0.1.1 - created: "2023-05-29T22:41:52.177318+01:00" + created: "2023-06-25T13:06:52.302223+01:00" description: sops secrets operator digest: 2e2762b8f9d66aab0caacde225955fec8bfd5a4cc10dc6943a1de3809dda4091 maintainers: @@ -1352,7 +1372,7 @@ entries: version: 0.3.1 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-05-29T22:41:52.17713+01:00" + created: "2023-06-25T13:06:52.301901+01:00" description: sops secrets operator digest: ce84f5b64402a582c7689cb842ba03fb10f968c38b57dc9e05f588493128019a maintainers: @@ -1366,7 +1386,7 @@ entries: version: 0.3.0 - apiVersion: v2 appVersion: 0.0.10 - created: "2023-05-29T22:41:52.176948+01:00" + created: "2023-06-25T13:06:52.301612+01:00" description: sops secrets operator digest: 5e4c8bc37ea2c819c55b288c0a5e76ff8c9c02be591bd53776606666af45581c maintainers: @@ -1381,7 +1401,7 @@ entries: version: 0.2.1 - apiVersion: v1 appVersion: 0.0.10 - created: "2023-05-29T22:41:52.165858+01:00" + created: "2023-06-25T13:06:52.287305+01:00" description: sops secrets operator digest: 50b8ebab19008dfc43de1eaee8b0f6287f7a55134585dc6ae88df2520d779f8f maintainers: @@ -1393,4 +1413,4 @@ entries: urls: - https://isindir.github.io/sops-secrets-operator/sops-secrets-operator-0.1.10.tgz version: 0.1.10 -generated: "2023-05-29T22:41:52.165559+01:00" +generated: "2023-06-25T13:06:52.286456+01:00" diff --git a/docs/sops-secrets-operator-0.15.1.tgz b/docs/sops-secrets-operator-0.15.1.tgz new file mode 100644 index 00000000..ffd3c311 Binary files /dev/null and b/docs/sops-secrets-operator-0.15.1.tgz differ diff --git a/go.mod b/go.mod index dc5d9df8..d200ccf7 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ go 1.20 require ( github.com/go-logr/logr v1.2.4 - github.com/onsi/ginkgo/v2 v2.9.5 - github.com/onsi/gomega v1.27.7 - github.com/prometheus/client_golang v1.15.1 - github.com/sirupsen/logrus v1.9.0 + // https://github.com/onsi/ginkgo/releases + github.com/onsi/ginkgo/v2 v2.11.0 + github.com/onsi/gomega v1.27.8 + github.com/prometheus/client_golang v1.16.0 + github.com/sirupsen/logrus v1.9.3 // https://github.com/mozilla/sops/releases go.mozilla.org/sops/v3 v3.7.3 - k8s.io/api v0.27.2 + k8s.io/api v0.27.3 // https://github.com/kubernetes/apimachinery/tags - k8s.io/apimachinery v0.27.2 - k8s.io/client-go v0.27.2 + k8s.io/apimachinery v0.27.3 + k8s.io/client-go v0.27.3 sigs.k8s.io/controller-runtime v0.15.0 ) @@ -105,7 +106,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a // indirect @@ -116,11 +117,11 @@ require ( golang.org/x/crypto v0.1.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sys v0.8.0 // indirect + golang.org/x/sys v0.9.0 // indirect golang.org/x/term v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.9.1 // indirect + golang.org/x/tools v0.9.3 // indirect gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect google.golang.org/api v0.74.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index e38b5647..616aa9cb 100644 --- a/go.sum +++ b/go.sum @@ -437,10 +437,10 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= -github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= -github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= -github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= -github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= +github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= +github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= +github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/runc v1.1.0 h1:O9+X96OcDjkmmZyfaG996kV7yq8HsoU2h1XRRQcefG8= @@ -460,8 +460,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= -github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -475,8 +475,8 @@ github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -485,8 +485,8 @@ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkB github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -720,8 +720,8 @@ golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= @@ -796,8 +796,8 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1002,14 +1002,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo= -k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4= +k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y= +k8s.io/api v0.27.3/go.mod h1:C4BNvZnQOF7JA/0Xed2S+aUyJSfTGkGFxLXz9MnpIpg= k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo= k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= -k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg= -k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= -k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE= -k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ= +k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM= +k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8= +k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48= k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo= k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= diff --git a/internal/controllers/sopssecret_controller.go b/internal/controllers/sopssecret_controller.go index d35a10a3..b5007c50 100644 --- a/internal/controllers/sopssecret_controller.go +++ b/internal/controllers/sopssecret_controller.go @@ -9,7 +9,7 @@ import ( "encoding/base64" "encoding/json" "fmt" - "io/ioutil" + "io" "time" "github.com/go-logr/logr" @@ -57,7 +57,7 @@ type SopsSecretReconciler struct { func (r *SopsSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = r.Log.WithValues("sopssecret", req.NamespacedName) - r.Log.Info("Reconciling", "sopssecret", req.NamespacedName) + r.Log.V(0).Info("Reconciling", "sopssecret", req.NamespacedName) encryptedSopsSecret, finishReconcileLoop, err := r.getEncryptedSopsSecret(ctx, req) if finishReconcileLoop { @@ -76,7 +76,7 @@ func (r *SopsSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) } // Iterate over secret templates - r.Log.Info("Entering template data loop", "sopssecret", req.NamespacedName) + r.Log.V(1).Info("Entering template data loop", "sopssecret", req.NamespacedName) for _, secretTemplate := range plainTextSopsSecret.Spec.SecretsTemplate { kubeSecretFromTemplate, rescheduleReconcileLoop := r.newKubeSecretFromTemplate(req, encryptedSopsSecret, plainTextSopsSecret, &secretTemplate) @@ -105,10 +105,10 @@ func (r *SopsSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) } encryptedSopsSecret.Status.Message = "Healthy" - r.Status().Update(context.Background(), encryptedSopsSecret) + _ = r.Status().Update(context.Background(), encryptedSopsSecret) sopsSecretsReconciliations.Inc() - r.Log.Info("SopsSecret is Healthy", "sopssecret", req.NamespacedName) + r.Log.V(1).Info("SopsSecret is Healthy", "sopssecret", req.NamespacedName) return ctrl.Result{}, nil } @@ -120,8 +120,7 @@ func (r *SopsSecretReconciler) decryptSopsSecret( encryptedSopsSecret.Status.Message = "Decryption error" // will not process plainTextSopsSecret error as we are already in error mode here - r.Status().Update(context.Background(), encryptedSopsSecret) - + _ = r.Status().Update(context.Background(), encryptedSopsSecret) // Failed to decrypt, re-schedule reconciliation in 5 minutes return nil, true } @@ -136,9 +135,9 @@ func (r *SopsSecretReconciler) isKubeSecretManagedOrAnnotatedToBeManaged( // kubeSecretFromTemplate found - perform ownership check if !metav1.IsControlledBy(kubeSecretInCluster, encryptedSopsSecret) && !isAnnotatedToBeManaged(kubeSecretInCluster) { encryptedSopsSecret.Status.Message = "Child secret is not owned by controller error" - r.Status().Update(context.Background(), encryptedSopsSecret) + _ = r.Status().Update(context.Background(), encryptedSopsSecret) - r.Log.Info( + r.Log.V(0).Info( "Child secret is not owned by controller or sopssecret Error", "sopssecret", req.NamespacedName, "error", fmt.Errorf("sopssecret has a conflict with existing kubernetes secret resource, potential reasons: target secret already pre-existed or is managed by multiple sops secrets"), @@ -168,23 +167,23 @@ func (r *SopsSecretReconciler) refreshKubeSecretIfNeeded( } if !apiequality.Semantic.DeepEqual(kubeSecretInCluster, copyOfKubeSecretInCluster) { - r.Log.Info( + r.Log.V(0).Info( "Secret already exists and needs to be refreshed", "secret", copyOfKubeSecretInCluster.Name, "namespace", copyOfKubeSecretInCluster.Namespace, ) if err := r.Update(ctx, copyOfKubeSecretInCluster); err != nil { encryptedSopsSecret.Status.Message = "Child secret update error" - r.Status().Update(context.Background(), encryptedSopsSecret) + _ = r.Status().Update(context.Background(), encryptedSopsSecret) - r.Log.Info( + r.Log.V(0).Info( "Child secret update error", "sopssecret", req.NamespacedName, "error", err, ) return true } - r.Log.Info( + r.Log.V(0).Info( "Secret successfully refreshed", "secret", copyOfKubeSecretInCluster.Name, "namespace", copyOfKubeSecretInCluster.Namespace, @@ -213,7 +212,7 @@ func (r *SopsSecretReconciler) getSecretFromClusterOrCreateFromTemplate( // No kubeSecretFromTemplate alike found - CREATE one if errors.IsNotFound(err) { - r.Log.Info( + r.Log.V(1).Info( "Creating a new Secret", "sopssecret", req.NamespacedName, "message", err, @@ -225,9 +224,9 @@ func (r *SopsSecretReconciler) getSecretFromClusterOrCreateFromTemplate( // Unknown error while trying to find kubeSecretFromTemplate in cluster - reschedule reconciliation if err != nil { encryptedSopsSecret.Status.Message = "Unknown Error" - r.Status().Update(context.Background(), encryptedSopsSecret) + _ = r.Status().Update(context.Background(), encryptedSopsSecret) - r.Log.Info( + r.Log.V(0).Info( "Unknown Error", "sopssecret", req.NamespacedName, "error", err, @@ -249,9 +248,9 @@ func (r *SopsSecretReconciler) newKubeSecretFromTemplate( kubeSecretFromTemplate, err := createKubeSecretFromTemplate(plainTextSopsSecret, secretTemplate, r.Log) if err != nil { encryptedSopsSecret.Status.Message = "New child secret creation error" - r.Status().Update(context.Background(), encryptedSopsSecret) + _ = r.Status().Update(context.Background(), encryptedSopsSecret) - r.Log.Info( + r.Log.V(0).Info( "New child secret creation error", "sopssecret", req.NamespacedName, "error", err, @@ -263,9 +262,9 @@ func (r *SopsSecretReconciler) newKubeSecretFromTemplate( err = controllerutil.SetControllerReference(encryptedSopsSecret, kubeSecretFromTemplate, r.Scheme) if err != nil { encryptedSopsSecret.Status.Message = "Setting controller ownership of the child secret error" - r.Status().Update(context.Background(), encryptedSopsSecret) + _ = r.Status().Update(context.Background(), encryptedSopsSecret) - r.Log.Info( + r.Log.V(0).Info( "Setting controller ownership of the child secret error", "sopssecret", req.NamespacedName, "error", err, @@ -282,13 +281,13 @@ func (r *SopsSecretReconciler) isSecretSuspended( // Return early if SopsSecret object is suspended. if encryptedSopsSecret.Spec.Suspend { - r.Log.Info( + r.Log.V(0).Info( "Reconciliation is suspended for this object", "sopssecret", req.NamespacedName, ) encryptedSopsSecret.Status.Message = "Reconciliation is suspended" - r.Status().Update(context.Background(), encryptedSopsSecret) + _ = r.Status().Update(context.Background(), encryptedSopsSecret) return true } @@ -307,7 +306,7 @@ func (r *SopsSecretReconciler) getEncryptedSopsSecret( // Request object not found, could have been deleted after reconcile request. // Owned objects are automatically garbage collected. For additional cleanup logic use finalizers. // Return and don't requeue - r.Log.Info( + r.Log.V(0).Info( "Request object not found, could have been deleted after reconcile request", "sopssecret", req.NamespacedName, @@ -316,7 +315,7 @@ func (r *SopsSecretReconciler) getEncryptedSopsSecret( } // Error reading the object - requeue the request. - r.Log.Info( + r.Log.V(0).Info( "Error reading the object", "sopssecret", req.NamespacedName, @@ -339,7 +338,7 @@ func (r *SopsSecretReconciler) SetupWithManager(mgr ctrl.Manager) error { // Set logrus logs to be discarded for k := range sopslogging.Loggers { - sopslogging.Loggers[k].Out = ioutil.Discard + sopslogging.Loggers[k].Out = io.Discard } return ctrl.NewControllerManagedBy(mgr). @@ -367,7 +366,7 @@ func createKubeSecretFromTemplate( labels := cloneMap(sopsSecretTemplate.Labels) annotations := cloneMap(sopsSecretTemplate.Annotations) - logger.Info("Processing", + logger.V(1).Info("Processing", "sopssecret", fmt.Sprintf("%s.%s.%s", sopsSecret.Kind, sopsSecret.APIVersion, sopsSecret.Name), "type", sopsSecretTemplate.Type, "namespace", sopsSecret.Namespace, @@ -442,7 +441,7 @@ func decryptSopsSecretInstance( ) (*isindirv1alpha3.SopsSecret, error) { sopsSecretAsBytes, err := json.Marshal(encryptedSopsSecret) if err != nil { - logger.Info( + logger.V(0).Info( "Failed to convert encrypted sops secret to bytes[]", "sopssecret", fmt.Sprintf("%s/%s", encryptedSopsSecret.Namespace, encryptedSopsSecret.Name), "error", err, @@ -452,7 +451,7 @@ func decryptSopsSecretInstance( decryptedSopsSecretAsBytes, err := customDecryptData(sopsSecretAsBytes, "json") if err != nil { - logger.Info( + logger.V(0).Info( "Failed to Decrypt encrypted sops secret decryptedSopsSecret", "sopssecret", fmt.Sprintf("%s/%s", encryptedSopsSecret.Namespace, encryptedSopsSecret.Name), "error", err, @@ -463,7 +462,7 @@ func decryptSopsSecretInstance( decryptedSopsSecret := &isindirv1alpha3.SopsSecret{} err = json.Unmarshal(decryptedSopsSecretAsBytes, &decryptedSopsSecret) if err != nil { - logger.Info( + logger.V(0).Info( "Failed to Unmarshal decrypted sops secret decryptedSopsSecret", "sopssecret", fmt.Sprintf("%s/%s", encryptedSopsSecret.Namespace, encryptedSopsSecret.Name), "error", err, diff --git a/internal/controllers/sopssecret_controller_test.go b/internal/controllers/sopssecret_controller_test.go index 370387dc..c2bbacf8 100644 --- a/internal/controllers/sopssecret_controller_test.go +++ b/internal/controllers/sopssecret_controller_test.go @@ -16,7 +16,6 @@ import ( "k8s.io/client-go/kubernetes/scheme" "context" - "io/ioutil" "path/filepath" "time" ) @@ -27,7 +26,7 @@ var _ = Describe("SopssecretController", func() { TestSecretObject02 := &isindirv1alpha3.SopsSecret{} BeforeEach(func() { // 00 secret - content, err := ioutil.ReadFile(filepath.Join("..", "..", "config", "age-test-key", "00-test-secrets.yaml")) + content, err := os.ReadFile(filepath.Join("..", "..", "config", "age-test-key", "00-test-secrets.yaml")) Expect(err).Should(BeNil()) obj, _, err := scheme.Codecs.UniversalDeserializer().Decode(content, nil, nil) @@ -35,7 +34,7 @@ var _ = Describe("SopssecretController", func() { Expect(err).Should(BeNil()) // 01 secret - content, err = ioutil.ReadFile(filepath.Join("..", "..", "config", "age-test-key", "01-test-secrets.yaml")) + content, err = os.ReadFile(filepath.Join("..", "..", "config", "age-test-key", "01-test-secrets.yaml")) Expect(err).Should(BeNil()) obj, _, err = scheme.Codecs.UniversalDeserializer().Decode(content, nil, nil) @@ -43,7 +42,7 @@ var _ = Describe("SopssecretController", func() { Expect(err).Should(BeNil()) // 02 secret - content, err = ioutil.ReadFile(filepath.Join("..", "..", "config", "age-test-key", "02-test-secrets.yaml")) + content, err = os.ReadFile(filepath.Join("..", "..", "config", "age-test-key", "02-test-secrets.yaml")) Expect(err).Should(BeNil()) obj, _, err = scheme.Codecs.UniversalDeserializer().Decode(content, nil, nil) diff --git a/internal/controllers/suite_test.go b/internal/controllers/suite_test.go index faba75a2..cd62ae3c 100644 --- a/internal/controllers/suite_test.go +++ b/internal/controllers/suite_test.go @@ -13,7 +13,6 @@ import ( . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" @@ -27,8 +26,8 @@ import ( // These tests use Ginkgo (BDD-style Go testing framework). Refer to // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. +// cfg *rest.Config var ( - cfg *rest.Config K8sClient client.Client testEnv *envtest.Environment ctx context.Context