From 5dabbd71aa73dac7bb2fc5df66aeb3d819eaa7f5 Mon Sep 17 00:00:00 2001 From: Mazin S Date: Mon, 22 Apr 2024 15:12:11 -0700 Subject: [PATCH 01/10] bump up upgrade --- charts/ndb-operator/Chart.yaml | 14 ++++++++++---- ...deployment-ndb-operator-controller-manager.yaml | 8 +++----- .../issuer-ndb-operator-selfsigned-issuer.yaml | 1 - charts/ndb-operator/values.yaml | 2 -- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/charts/ndb-operator/Chart.yaml b/charts/ndb-operator/Chart.yaml index 888bdd9..7627b9a 100644 --- a/charts/ndb-operator/Chart.yaml +++ b/charts/ndb-operator/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: ndb-operator description: A Helm chart for Nutanix Database Kubernetes Operator type: application -version: 0.5.1 -appVersion: v0.5.0 +version: 0.5.2 +appVersion: v0.5.1 maintainers: - name: mazin-s email: mazin.shaaeldin@nutanix.com @@ -22,8 +22,14 @@ maintainers: icon: https://www.nutanix.com/content/dam/nutanix/global/icons/products/svg/Nutanix-Era-40.svg annotations: artifacthub.io/changes: | - - kind: security - description: "Bumped kube-rbac-proxy to v0.15.0" + - kind: fix + description: "Upgraded CONTROLLER_TOOLS_VERSION from v0.9.2 to v0.14.0" + - kind: fix + description: "Upgraded go version in go.mod from 1.20 to 1.21.7" + - kind: fix + description: "Removed samples folder reference which was located in config/manifests/kustomization" + - kind: security + description: "Upgraded kube-rbac-proxy version from v0.15.0 to v0.16.0 and other go modules to newer versions" artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/license: Apache-2.0 artifacthub.io/maintainers: | diff --git a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml index bbd6e0f..50023b0 100644 --- a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml +++ b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml @@ -26,7 +26,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 - --leader-elect - image: {{ .Values.image.repository }}:{{ .Values.image.tag | default $.Chart.AppVersion }} + image: {{ .Values.image.repository }}:{{ $.Chart.AppVersion }} livenessProbe: httpGet: path: /healthz @@ -59,7 +59,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 name: kube-rbac-proxy ports: - containerPort: 8443 @@ -75,7 +75,7 @@ spec: drop: - ALL securityContext: - runAsNonRoot: true + runAsNonRoot: true serviceAccountName: {{ include "ndb-operator.fullname" . }}-service-account terminationGracePeriodSeconds: 10 volumes: @@ -83,7 +83,6 @@ spec: secret: defaultMode: 420 secretName: webhook-server-cert - {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -96,4 +95,3 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - terminationGracePeriodSeconds: 10 diff --git a/charts/ndb-operator/templates/issuer-ndb-operator-selfsigned-issuer.yaml b/charts/ndb-operator/templates/issuer-ndb-operator-selfsigned-issuer.yaml index ae48ffd..aa50863 100644 --- a/charts/ndb-operator/templates/issuer-ndb-operator-selfsigned-issuer.yaml +++ b/charts/ndb-operator/templates/issuer-ndb-operator-selfsigned-issuer.yaml @@ -12,4 +12,3 @@ metadata: namespace: {{.Release.Namespace}} spec: selfSigned: {} - diff --git a/charts/ndb-operator/values.yaml b/charts/ndb-operator/values.yaml index 8e408fd..d9bfd7d 100644 --- a/charts/ndb-operator/values.yaml +++ b/charts/ndb-operator/values.yaml @@ -3,8 +3,6 @@ replicaCount: 1 image: repository: ghcr.io/nutanix-cloud-native/ndb-operator/controller pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" imagePullSecrets: [] nameOverride: "" From 9f4fb898ab10e2bf7db6cf413d94fc42dd44fb8c Mon Sep 17 00:00:00 2001 From: Mazin S Date: Mon, 22 Apr 2024 15:28:27 -0700 Subject: [PATCH 02/10] idk --- charts/ndb-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ndb-operator/Chart.yaml b/charts/ndb-operator/Chart.yaml index 7627b9a..5bd682a 100644 --- a/charts/ndb-operator/Chart.yaml +++ b/charts/ndb-operator/Chart.yaml @@ -26,7 +26,7 @@ annotations: description: "Upgraded CONTROLLER_TOOLS_VERSION from v0.9.2 to v0.14.0" - kind: fix description: "Upgraded go version in go.mod from 1.20 to 1.21.7" - - kind: fix + - kind: fix description: "Removed samples folder reference which was located in config/manifests/kustomization" - kind: security description: "Upgraded kube-rbac-proxy version from v0.15.0 to v0.16.0 and other go modules to newer versions" From 02dc2426dc672f9035b172db38fd3254c49df4a1 Mon Sep 17 00:00:00 2001 From: Mazin S Date: Mon, 22 Apr 2024 15:32:26 -0700 Subject: [PATCH 03/10] lint remove --- charts/ndb-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ndb-operator/Chart.yaml b/charts/ndb-operator/Chart.yaml index 5bd682a..67cb541 100644 --- a/charts/ndb-operator/Chart.yaml +++ b/charts/ndb-operator/Chart.yaml @@ -22,7 +22,7 @@ maintainers: icon: https://www.nutanix.com/content/dam/nutanix/global/icons/products/svg/Nutanix-Era-40.svg annotations: artifacthub.io/changes: | - - kind: fix + - kind: fix description: "Upgraded CONTROLLER_TOOLS_VERSION from v0.9.2 to v0.14.0" - kind: fix description: "Upgraded go version in go.mod from 1.20 to 1.21.7" From 3e4cd49cba68da1d55bfe7b46a1d5c01d101b74a Mon Sep 17 00:00:00 2001 From: Mazin S Date: Mon, 22 Apr 2024 15:33:43 -0700 Subject: [PATCH 04/10] got rid of space --- charts/ndb-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ndb-operator/Chart.yaml b/charts/ndb-operator/Chart.yaml index 67cb541..2bd5196 100644 --- a/charts/ndb-operator/Chart.yaml +++ b/charts/ndb-operator/Chart.yaml @@ -28,7 +28,7 @@ annotations: description: "Upgraded go version in go.mod from 1.20 to 1.21.7" - kind: fix description: "Removed samples folder reference which was located in config/manifests/kustomization" - - kind: security + - kind: security description: "Upgraded kube-rbac-proxy version from v0.15.0 to v0.16.0 and other go modules to newer versions" artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/license: Apache-2.0 From abfde45047097273b34c61f842fa390d7d4f2418 Mon Sep 17 00:00:00 2001 From: Mazin S Date: Tue, 23 Apr 2024 11:26:22 -0700 Subject: [PATCH 05/10] addressed comments --- charts/ndb-operator/Chart.yaml | 8 ++------ .../deployment-ndb-operator-controller-manager.yaml | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/charts/ndb-operator/Chart.yaml b/charts/ndb-operator/Chart.yaml index 2bd5196..d79434d 100644 --- a/charts/ndb-operator/Chart.yaml +++ b/charts/ndb-operator/Chart.yaml @@ -23,13 +23,9 @@ icon: https://www.nutanix.com/content/dam/nutanix/global/icons/products/svg/Nuta annotations: artifacthub.io/changes: | - kind: fix - description: "Upgraded CONTROLLER_TOOLS_VERSION from v0.9.2 to v0.14.0" - - kind: fix - description: "Upgraded go version in go.mod from 1.20 to 1.21.7" - - kind: fix - description: "Removed samples folder reference which was located in config/manifests/kustomization" + description: "Upgraded internal dependencies." - kind: security - description: "Upgraded kube-rbac-proxy version from v0.15.0 to v0.16.0 and other go modules to newer versions" + description: "Upgraded kube-rbac-proxy from v0.15.0 to v0.17.0." artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/license: Apache-2.0 artifacthub.io/maintainers: | diff --git a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml index 50023b0..20fe832 100644 --- a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml +++ b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml @@ -59,7 +59,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.17.0 name: kube-rbac-proxy ports: - containerPort: 8443 From 1a8ae1f6ce5f9f3909e5204c8e76acf5beade70f Mon Sep 17 00:00:00 2001 From: Mazin S Date: Tue, 23 Apr 2024 12:26:32 -0700 Subject: [PATCH 06/10] test, will undo --- .../templates/deployment-ndb-operator-controller-manager.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml index 20fe832..6c17dd7 100644 --- a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml +++ b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml @@ -59,7 +59,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.17.0 + image: quay.io/brancz/kube-rbac-proxy:v0.17.0 name: kube-rbac-proxy ports: - containerPort: 8443 From ae41bd6fd185f4d4fcba934f714473d69533c39f Mon Sep 17 00:00:00 2001 From: Mazin S Date: Wed, 24 Apr 2024 11:13:02 -0700 Subject: [PATCH 07/10] kube-rbac-proxy:v0.16.0 --- .../templates/deployment-ndb-operator-controller-manager.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml index 6c17dd7..50023b0 100644 --- a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml +++ b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml @@ -59,7 +59,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: quay.io/brancz/kube-rbac-proxy:v0.17.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 name: kube-rbac-proxy ports: - containerPort: 8443 From 060e5a34e62d8d0c3279f58d36993b708dc1c1db Mon Sep 17 00:00:00 2001 From: Mazin S Date: Wed, 24 Apr 2024 11:14:28 -0700 Subject: [PATCH 08/10] updated description --- charts/ndb-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ndb-operator/Chart.yaml b/charts/ndb-operator/Chart.yaml index d79434d..d7c5de6 100644 --- a/charts/ndb-operator/Chart.yaml +++ b/charts/ndb-operator/Chart.yaml @@ -25,7 +25,7 @@ annotations: - kind: fix description: "Upgraded internal dependencies." - kind: security - description: "Upgraded kube-rbac-proxy from v0.15.0 to v0.17.0." + description: "Upgraded kube-rbac-proxy from v0.15.0 to v0.16.0." artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/license: Apache-2.0 artifacthub.io/maintainers: | From 99e368994ce7d6ff2cf2c907a7d0d6c2db0dc733 Mon Sep 17 00:00:00 2001 From: Mazin S Date: Thu, 25 Apr 2024 10:25:32 -0700 Subject: [PATCH 09/10] addressed comments --- .../templates/deployment-ndb-operator-controller-manager.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml index 50023b0..e867be8 100644 --- a/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml +++ b/charts/ndb-operator/templates/deployment-ndb-operator-controller-manager.yaml @@ -26,7 +26,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 - --leader-elect - image: {{ .Values.image.repository }}:{{ $.Chart.AppVersion }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag | default $.Chart.AppVersion }} livenessProbe: httpGet: path: /healthz @@ -75,7 +75,7 @@ spec: drop: - ALL securityContext: - runAsNonRoot: true + runAsNonRoot: true serviceAccountName: {{ include "ndb-operator.fullname" . }}-service-account terminationGracePeriodSeconds: 10 volumes: From d5e1a32ddccd1ac92b5f9768f64f65193f3da8d5 Mon Sep 17 00:00:00 2001 From: Mazin S Date: Thu, 25 Apr 2024 10:27:20 -0700 Subject: [PATCH 10/10] addressed comments --- charts/ndb-operator/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/ndb-operator/values.yaml b/charts/ndb-operator/values.yaml index d9bfd7d..8e408fd 100644 --- a/charts/ndb-operator/values.yaml +++ b/charts/ndb-operator/values.yaml @@ -3,6 +3,8 @@ replicaCount: 1 image: repository: ghcr.io/nutanix-cloud-native/ndb-operator/controller pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" imagePullSecrets: [] nameOverride: ""