Update Portworx to 2.13.3 and add custom namespace support

Signed-off-by: Tapas Sharma <[email protected]>
portworx · May 4, 2023 · aab89e0 · CharudathGopal · May 4, 2023 · aab89e0
1 parent c4a4344
commit aab89e0
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 67 deletions.
diff --git a/charts/portworx/Chart.yaml b/charts/portworx/Chart.yaml
@@ -1,8 +1,8 @@
 name: portworx
-version: 2.13.0
+version: 2.13.3
 description: A Helm chart for installing Portworx on Kubernetes.
 kubeVersion: ">=1.10.0"
-appVersion: "2.12.2"
+appVersion: "2.13.3"
 apiVersion: v1
 keywords:
   - Storage

diff --git a/charts/portworx/templates/_helpers.tpl b/charts/portworx/templates/_helpers.tpl
@@ -221,6 +221,18 @@ Generate a random token for storage provisioning
 {{- end -}}
 
 
+{{- define "px.getDeploymentNamespace" -}}
+{{- if (.Release.Namespace) -}}
+    {{- if (eq "default" .Release.Namespace) -}}
+        {{- printf "kube-system"  -}}
+    {{- else -}}
+        {{- printf "%s" .Release.Namespace -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
 {{- define "px.affinityPxEnabledValue" -}}
 {{- if .Values.requirePxEnabledTag -}}
     {{- "true"  | quote }}

diff --git a/charts/portworx/templates/hooks/post-install/px-create-cluster-token.yaml b/charts/portworx/templates/hooks/post-install/px-create-cluster-token.yaml
@@ -5,7 +5,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
   name: px-set-cluster-token
   labels:
     heritage: {{.Release.Service | quote }}
@@ -36,7 +36,7 @@ spec:
           {{- end }}
           env:
             - name: NS
-              value: kube-system
+              value: {{ template "px.getDeploymentNamespace" . }}
             - name: KEY
               value: cluster-wide-secret-key
           command: ['/bin/bash', '-c']
@@ -53,7 +53,7 @@ spec:
           {{- end }}
           env:
             - name: NS
-              value: kube-system
+              value: {{ template "px.getDeploymentNamespace" . }}
           command: ['/bin/bash', '-c']
           args:
             - |
@@ -69,7 +69,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.clusterToken.serviceAccountName }}
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
   annotations:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
     "helm.sh/hook": "post-install"
@@ -87,7 +87,7 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
     "helm.sh/hook": post-install
   name: {{ .Values.clusterToken.serviceAccountName }}-role
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
 rules:
   - apiGroups: [""]
     resources: ["pods"]
@@ -103,11 +103,11 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
     "helm.sh/hook": post-install
   name: {{ .Values.clusterToken.serviceAccountName }}-binding
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.clusterToken.serviceAccountName }}
-    namespace: kube-system
+    namespace: {{ template "px.getDeploymentNamespace" . }}
 roleRef:
   kind: Role
   name: {{ .Values.clusterToken.serviceAccountName }}-role

diff --git a/charts/portworx/templates/hooks/pre-delete/delete-storagecluster.yaml b/charts/portworx/templates/hooks/pre-delete/delete-storagecluster.yaml
@@ -6,7 +6,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
   name: px-hook-delete-storagecluster
   labels:
     heritage: {{.Release.Service | quote }}
@@ -37,5 +37,5 @@ spec:
           {{- end}}
           command: ['/bin/sh',
                     '-c',
-                    'kubectl -n kube-system delete storagecluster {{ $clusterName }} --ignore-not-found']
+                    'kubectl -n {{ template "px.getDeploymentNamespace" . }} delete storagecluster {{ $clusterName }} --ignore-not-found']
 {{- end }}
diff --git a/charts/portworx/templates/hooks/pre-upgrade/retain-daemonset-install.yaml b/charts/portworx/templates/hooks/pre-upgrade/retain-daemonset-install.yaml
@@ -4,7 +4,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
   name: px-hook-retain-daemonset-resources
   labels:
     heritage: {{.Release.Service | quote }}

diff --git a/charts/portworx/templates/portworx-operator.yaml b/charts/portworx/templates/portworx-operator.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: portworx-operator
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
 {{- if (semverCompare "<1.25" (.Capabilities.KubeVersion.GitVersion | regexFind "^v\\d+\\.\\d+\\.\\d+"| trimPrefix "v"))}}
 ---
 apiVersion: policy/v1beta1
@@ -47,7 +47,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: portworx-operator
-    namespace: kube-system
+    namespace: {{ template "px.getDeploymentNamespace" . }}
 roleRef:
   kind: ClusterRole
   name: portworx-operator
@@ -57,7 +57,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: portworx-operator
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
 spec:
   strategy:
     rollingUpdate:

diff --git a/charts/portworx/templates/serviceaccount-hook.yaml b/charts/portworx/templates/serviceaccount-hook.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "px.hookServiceAccount" . }}
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
   annotations:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
     "helm.sh/hook": "post-install,pre-upgrade,pre-delete"
@@ -40,7 +40,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: {{ template "px.hookServiceAccount" . }}
-    namespace: kube-system
+    namespace: {{ template "px.getDeploymentNamespace" . }}
 roleRef:
   kind: ClusterRole
   name: {{ template "px.hookClusterRole" . }}

diff --git a/charts/portworx/templates/storage-cluster.yaml b/charts/portworx/templates/storage-cluster.yaml
@@ -32,7 +32,7 @@ kind: StorageCluster
 apiVersion: core.libopenstorage.org/v1
 metadata:
   name: "{{ required "Clustername cannot be empty" .Values.clusterName }}"
-  namespace: kube-system
+  namespace: {{ template "px.getDeploymentNamespace" . }}
   annotations:
     {{- if eq $openshiftInstall true }}
     portworx.io/is-openshift: "true"

diff --git a/charts/portworx/values.yaml b/charts/portworx/values.yaml
@@ -3,8 +3,8 @@
 deployOperator: true                    # Deploy the Portworx operator
 deployCluster: true                     # Deploy the Portworx cluster
 
-imageVersion: 2.13.0                    # Version of the PX Image.
-pxOperatorImageVersion: 23.3.0           # Version of the PX operator image.
+imageVersion: 2.13.3                    # Version of the PX Image.
+pxOperatorImageVersion: 23.4.0           # Version of the PX operator image.
 
 openshiftInstall: false                 # Defaults to false for installing Portworx on Openshift .
 isTargetOSCoreOS: false                 # Is your target OS CoreOS? Defaults to false.