Merge pull request #429 from portworx/pre-release-2.3.0

Releasing px-central 2.3.0 helm chart.
portworx · Sep 15, 2022 · 358fc83 · 358fc83
2 parents ee492e4 + 71f6ba3
commit 358fc83
Show file tree

Hide file tree

Showing 10 changed files with 181 additions and 123 deletions.
diff --git a/charts/px-central/Chart.yaml b/charts/px-central/Chart.yaml
@@ -13,6 +13,6 @@ keywords:
 name: px-central
 sources:
 - https://github.com/portworx/helm/tree/master/charts/px-central
-version: 2.2.2
-appVersion: 2.2.2
+version: 2.3.0
+appVersion: 2.3.0
 name: px-central
diff --git a/charts/px-central/README.md b/charts/px-central/README.md
@@ -565,6 +565,7 @@ Parameter | Description | Default
 `pxbackup.enabled` | Enabled PX-Backup | `false`
 `pxbackup.orgName` | PX-Backup organization name | `default`
 `pxbackup.mongoMigration` | flag for mongo migration while upgrading PX-Backup from 1.2.x to 2.x.x | `complete`
+`pxbackup.livenessProbeInitialDelay` | initialDelaySeconds for livenessProbe of PX-Backup pod | `1800`
 `persistentStorage.mongodbVolumeSize` | mongodb volume size | `"64Gi"`
 `persistentStorage.mongoCacheSize` | mongodb cache size in GB | `"4"`
 `service.pxBackupUIServiceType` | service type of PX-Backup UI | `"LoadBalancer"`
@@ -576,7 +577,7 @@ Parameter | Description | Default
 `images.mongodbImage.registry` | PX-Backup mongodb image registry | `docker.io`
 `images.mongodbImage.repo` | PX-Backup mongodb image repo | `bitnami`
 `images.mongodbImage.imageName` | PX-Backup mongodb image name | `mongodb`
-`images.mongodbImage.tag` | PX-Backup mongodb image tag | `4.4.4-debian-10-r30`
+`images.mongodbImage.tag` | PX-Backup mongodb image tag | `5.0.10-debian-11-r3`
 
 ### PX-Monitor parameters
 

diff --git a/charts/px-central/templates/px-backup/pxcentral-backup.yaml b/charts/px-central/templates/px-backup/pxcentral-backup.yaml
@@ -178,6 +178,10 @@ spec:
           value: {{ .Values.pxbackup.orgName }}
         - name: PX_BACKUP_DEFAULT_DATASTORE
           value: mongodb
+        - name: SOFT_LICENSING_PERIOD
+          value: "30"
+        - name: AIRGAP_REPORTING_PERIOD
+          value: "90"
         {{- if .Values.caCertsSecretName }}
         - name: SSL_CERT_DIR
           value: /tmp/certs
@@ -199,7 +203,7 @@ spec:
           httpGet:
             path: /v1/health
             port: 10001
-          initialDelaySeconds: 600
+          initialDelaySeconds: {{ .Values.pxbackup.livenessProbeInitialDelay }}
           timeoutSeconds: 1
           periodSeconds: 60
         {{- if .Values.caCertsSecretName }}  

diff --git a/charts/px-central/templates/px-monitor/cortex/cortex-sts.yaml b/charts/px-central/templates/px-monitor/cortex/cortex-sts.yaml
@@ -418,6 +418,8 @@ spec:
             {{- if .Values.pxmonitor.consulBindInterface }}
             - name: CONSUL_BIND_INTERFACE
               value: {{ .Values.pxmonitor.consulBindInterface }}
+            - name: CONSUL_BIND_ADDR
+              value: "127.0.0.1"
             {{- end }}
           livenessProbe:
             exec:

diff --git a/charts/px-central/templates/px-monitor/cortex/cortex.yaml b/charts/px-central/templates/px-monitor/cortex/cortex.yaml
@@ -1157,7 +1157,7 @@ spec:
             - "-config.file=/etc/cortex/cortex.yaml"
             - "-alertmanager.configs.url=http://pxcentral-cortex-configs.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080"
             {{- if eq .Values.pxmonitor.cortex.alertmanager.advertiseAddress "pod_ip"}}
-            - "-cluster.advertise-address=$(MY_POD_IP):9094"
+            - "-alertmanager.cluster.advertise-address=$(MY_POD_IP):9094"
             {{- end }}
           env:
             - name: MY_POD_IP

diff --git a/charts/px-central/templates/px-monitor/grafana/grafana-config.yaml b/charts/px-central/templates/px-monitor/grafana/grafana-config.yaml
@@ -18,7 +18,11 @@ data:
 
     [server]
     domain = {{ .Values.pxmonitor.pxCentralEndpoint }} 
-    root_url = "%(protocol)s://%(domain)s/grafana"
+    {{- if eq $sslEnabled true }} 
+    root_url = "https://%(domain)s/grafana"
+    {{- else }}
+    root_url = "http://%(domain)s/grafana"
+    {{- end }}
     enforce_domain = false
 
     [auth.basic]
@@ -35,6 +39,7 @@ data:
     token_url = {{ printf "https://%s/auth/realms/master/protocol/openid-connect/token" .Values.pxmonitor.pxCentralEndpoint }} 
     api_url = {{ printf "https://%s/auth/realms/master/protocol/openid-connect/userinfo" .Values.pxmonitor.pxCentralEndpoint }} 
     redirect_uri = {{ printf "https://%s/grafana/login/generic_oauth" .Values.pxmonitor.pxCentralEndpoint }} 
+    tls_skip_verify_insecure = true
     {{- else }}
     auth_url = {{ printf "http://%s/auth/realms/master/protocol/openid-connect/auth" .Values.pxmonitor.pxCentralEndpoint }} 
     token_url = {{ printf "http://%s/auth/realms/master/protocol/openid-connect/token" .Values.pxmonitor.pxCentralEndpoint }} 

diff --git a/charts/px-central/values.yaml b/charts/px-central/values.yaml
@@ -49,6 +49,7 @@ pxbackup:
   orgName: default
   callHome: true
   mongoMigration: complete
+  livenessProbeInitialDelay: 1800
 
 pxlicenseserver:
   enabled: false
@@ -122,27 +123,27 @@ images:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-api
-    tag: 2.2.2
+    tag: 2.3.0
   pxcentralFrontendImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-ui-frontend
-    tag: 2.2.2
+    tag: 2.3.0
   pxcentralBackendImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-ui-backend
-    tag: 2.2.2
+    tag: 2.3.0
   pxcentralMiddlewareImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-ui-lhbackend
-    tag: 2.2.2
+    tag: 2.3.0
   postInstallSetupImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-post-setup
-    tag: 2.2.2
+    tag: 2.3.0
   keycloakBackendImage:
     registry: docker.io
     repo: portworx
@@ -174,12 +175,12 @@ images:
     registry: docker.io
     repo: portworx
     imageName: px-backup
-    tag: 2.2.2
+    tag: 2.3.0
   mongodbImage:
     registry: docker.io
     repo: portworx
     imageName: mongodb
-    tag: 4.4.4-debian-10-r30 
+    tag: 5.0.10-debian-11-r3
 
   ## Images required for enabling px-license-server
   licenseServerImage:
@@ -198,17 +199,17 @@ images:
     registry: docker.io
     repo: portworx
     imageName: cassandra
-    tag: 4.0.4-debian-11-r0
+    tag: 4.0.4-debian-11-r14
   proxyConfigImage:
     registry: docker.io
     repo: portworx
     imageName: nginx
-    tag: 1.22.0-alpine
+    tag: 1.22.0-alpine-v2
   consulImage:
     registry: docker.io
     repo: portworx
     imageName: consul
-    tag: 1.12.2-debian-11-r0
+    tag: 1.12.2-debian-11-r14
   dnsmasqImage:
     registry: docker.io
     repo: portworx