Merge pull request #331 from portworx/pre-release-2.1.1

Releasing px-central 2.1.1 helm package
portworx · Jan 19, 2022 · fac0cdd · fac0cdd
2 parents 2c50561 + 739e51a
commit fac0cdd
Show file tree

Hide file tree

Showing 14 changed files with 184 additions and 103 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.0.1
-appVersion: 2.0.1
+version: 2.1.1
+appVersion: 2.1.1
 name: px-central
diff --git a/charts/px-central/templates/_helpers.tpl b/charts/px-central/templates/_helpers.tpl
@@ -34,7 +34,6 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "px-central.labels" -}}
-helm.sh/chart: {{ include "px-central.chart" . }}
 app.kubernetes.io/name: {{ template "px-central.name" . }}
 app.kubernetes.io/instance: {{.Release.Name | quote }}
 app.kubernetes.io/managed-by: {{.Release.Service | quote }}

diff --git a/charts/px-central/templates/px-backup/pxcentral-backup.yaml b/charts/px-central/templates/px-backup/pxcentral-backup.yaml
@@ -11,6 +11,42 @@ metadata:
     app.kubernetes.io/component: px-backup
 {{- include "px-central.labels" . | nindent 4 }}
 ---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: px-backup-cluster-role
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/component: px-backup
+{{- include "px-central.labels" . | nindent 4 }}
+rules:
+  - apiGroups: ["apiextensions.k8s.io"]
+    resources: ["customresourcedefinitions"]
+    verbs: ["create", "update", "get", "patch", "list", "watch"]
+  - apiGroups: ["batch"]
+    resources: ["jobs"]
+    verbs: ["get", "list"]
+  - apiGroups: [""]
+    resources: ["namespaces"]
+    verbs: ["get", "list"]
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: px-backup-cluster-role-binding
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/component: pxcentral-apiserver
+{{- include "px-central.labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: px-backup-account
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: px-backup-cluster-role
+  apiGroup: rbac.authorization.k8s.io
+---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -22,10 +58,22 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["get", "create", "delete", "update"]
+    verbs: ["get", "create", "delete", "update", "list"]
   - apiGroups: [""]
     resources: ["configmaps"]
-    verbs: ["get", "update"]
+    verbs: ["get", "update", "create"]
+  - apiGroups: ["batch"]
+    resources: ["jobs"]
+    verbs: ["get", "create", "delete", "update"]
+  - apiGroups: ["batch"]
+    resources: ["cronjobs"]
+    verbs: ["get", "create", "delete", "update"]
+  - apiGroups: ["kdmp.portworx.com"]
+    resources: ["backuplocationmaintenances"]
+    verbs: ["get", "create", "delete", "update"]
+  - apiGroups: ["kdmp.portworx.com"]
+    resources: ["volumebackupdeletes"]
+    verbs: ["get", "create", "delete", "update"]
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/charts/px-central/templates/px-license-server/deployment.yaml b/charts/px-central/templates/px-license-server/deployment.yaml
@@ -1,8 +1,9 @@
 {{/* Setting defaults if they are omitted. */}}
 {{- $UATLSType := .Values.pxlicenseserver.internal.lsTypeUAT -}}
 {{- $AirgappedLSType := .Values.pxlicenseserver.internal.lsTypeAirgapped -}}
+{{- $lsExternalEnabled := .Values.pxlicenseserver.external.enabled | default false -}}
 {{- $lsEnabled := .Values.pxlicenseserver.enabled | default false -}}
-{{- if eq $lsEnabled true }}
+{{- if and (eq $lsEnabled true) (eq $lsExternalEnabled false) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -13,6 +14,7 @@ metadata:
 {{- include "px-central.labels" . | nindent 4 }}
 spec:
   replicas: 2
+  revisionHistoryLimit: 0
   selector:
     matchLabels:
       app.kubernetes.io/component: pxcentral-license-server
@@ -92,4 +94,4 @@ spec:
       {{- end }}
       restartPolicy: Always
 ---
-{{- end -}}
+{{- end -}}
diff --git a/charts/px-central/templates/px-lighthouse/px-central-ui/pxcentral-lighthouse.yaml b/charts/px-central/templates/px-lighthouse/px-central-ui/pxcentral-lighthouse.yaml
@@ -38,11 +38,6 @@ spec:
   replicas: 1
   revisionHistoryLimit: 0
   minReadySeconds: 0
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
   strategy:
     rollingUpdate:
       maxSurge: 1

diff --git a/charts/px-central/templates/px-lighthouse/px-central-ui/pxcentral-ui.yaml b/charts/px-central/templates/px-lighthouse/px-central-ui/pxcentral-ui.yaml
@@ -162,7 +162,6 @@ spec:
         - name: init-mysql-db
           image: {{ printf "%s/%s/%s:%s" .Values.images.pxcentralBackendImage.registry .Values.images.pxcentralBackendImage.repo .Values.images.pxcentralBackendImage.imageName .Values.images.pxcentralBackendImage.tag }}
           imagePullPolicy: {{ .Values.images.pullPolicy }}
-          name: init-mysql-db
           command:
             - bash
             - -c
@@ -609,4 +608,4 @@ spec:
       port: 80
       targetPort: 8080
       protocol: TCP
----
+---
diff --git a/charts/px-central/templates/px-lighthouse/pxcentral-api-server.yaml b/charts/px-central/templates/px-lighthouse/pxcentral-api-server.yaml
@@ -110,11 +110,6 @@ spec:
   replicas: 1
   revisionHistoryLimit: 0
   minReadySeconds: 0
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -191,4 +186,4 @@ spec:
 {{ toYaml .Values.securityContext | indent 8 }}
       {{- end }}
       serviceAccountName: pxcentral-apiserver
-      restartPolicy: Always
+      restartPolicy: Always
diff --git a/charts/px-central/templates/px-monitor/cortex/cortex-backend.yaml b/charts/px-central/templates/px-monitor/cortex/cortex-backend.yaml
@@ -163,8 +163,6 @@ spec:
               value: dc1
             - name: CASSANDRA_ENDPOINT_SNITCH
               value: SimpleSnitch
-            - name: CASSANDRA_ENDPOINT_SNITCH
-              value: SimpleSnitch
             - name: CASSANDRA_RACK
               value: rack1
             - name: CASSANDRA_ENABLE_RPC

diff --git a/charts/px-central/templates/px-monitor/prometheus/prometheus.yaml b/charts/px-central/templates/px-monitor/prometheus/prometheus.yaml
@@ -69,6 +69,20 @@ metadata:
     app.kubernetes.io/component: pxcentral-prometheus
 {{- include "px-central.labels" . | nindent 4 }}
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          {{- if .Values.nodeAffinityLabel }}
+          - key: {{ .Values.nodeAffinityLabel }}
+            operator: Exists
+          {{- else }}
+          - key: pxmonitor/enabled
+            operator: NotIn
+            values:
+            - "false"
+          {{- end }}
   replicas: 1
   logLevel: debug
   serviceAccountName: pxcentral-prometheus
@@ -118,11 +132,16 @@ rules:
       - monitoring.coreos.com
     resources:
       - alertmanagers
+      - alertmanagers/finalizers
+      - alertmanagerconfigs
       - prometheuses
       - prometheuses/finalizers
+      - thanosrulers
+      - thanosrulers/finalizers
       - servicemonitors
       - prometheusrules
       - podmonitors
+      - probes
     verbs: ["*"]
   - apiGroups:
       - apps
@@ -210,7 +229,6 @@ spec:
         - args:
             - -namespaces={{ .Release.Namespace }}
             - --kubelet-service={{ .Release.Namespace }}/kubelet
-            - --config-reloader-image={{ printf "%s/%s/%s:%s" .Values.images.prometheusConfigReloadImage.registry .Values.images.prometheusConfigReloadImage.repo .Values.images.prometheusConfigReloadImage.imageName .Values.images.prometheusConfigReloadImage.tag }}
             - --prometheus-config-reloader={{ printf "%s/%s/%s:%s" .Values.images.prometheusConfigReloadrImage.registry .Values.images.prometheusConfigReloadrImage.repo .Values.images.prometheusConfigReloadrImage.imageName .Values.images.prometheusConfigReloadrImage.tag }}
           image: {{ printf "%s/%s/%s:%s" .Values.images.prometheusOperatorImage.registry .Values.images.prometheusOperatorImage.repo .Values.images.prometheusOperatorImage.imageName .Values.images.prometheusOperatorImage.tag }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}

diff --git a/charts/px-central/values.yaml b/charts/px-central/values.yaml
@@ -68,13 +68,13 @@ pxlicenseserver:
 
 pxmonitor:
   enabled: false
-  pxCentralEndpoint: 
+  pxCentralEndpoint:
   sslEnabled: false
   oidcClientID: pxcentral
   consulBindInterface: ""
   cortex:
     alertmanager:
-        advertiseAddress: ""
+      advertiseAddress: ""
 
 service:
   pxCentralUIServiceType: "LoadBalancer"
@@ -121,37 +121,37 @@ images:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-api
-    tag: 2.0.1
+    tag: 2.1.1
   pxcentralFrontendImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-ui-frontend
-    tag: 2.0.1
+    tag: 2.1.1
   pxcentralBackendImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-ui-backend
-    tag: 2.0.1
+    tag: 2.1.1
   pxcentralMiddlewareImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-ui-lhbackend
-    tag: 2.0.1
+    tag: 2.1.1
   postInstallSetupImage:
     registry: docker.io
     repo: portworx
     imageName: pxcentral-onprem-post-setup
-    tag: 2.0.1
+    tag: 2.1.1
   keycloakBackendImage:
     registry: docker.io
     repo: portworx
     imageName: postgresql
-    tag: 11.7.0-debian-10-r9
+    tag: 11.13.0-debian-10-r19
   keycloakFrontendImage:
     registry: docker.io
     repo: portworx
     imageName: keycloak
-    tag: 14.0.0
+    tag: 14.0.0-v2
   keycloakLoginThemeImage:
     registry: docker.io
     repo: portworx
@@ -166,14 +166,14 @@ images:
     registry: docker.io
     repo: portworx
     imageName: mysql
-    tag: 5.7.22
+    tag: 5.7.35
 
   ## Images required for enabling px-backup
   pxBackupImage:
     registry: docker.io
     repo: portworx
     imageName: px-backup
-    tag: 2.0.1
+    tag: 2.1.1
   etcdImage:
     registry: docker.io
     repo: portworx
@@ -227,22 +227,17 @@ images:
     registry: docker.io
     repo: portworx
     imageName: prometheus
-    tag: v2.7.1
-  prometheusConfigReloadImage:
-    registry: docker.io
-    repo: portworx
-    imageName: configmap-reload
-    tag: v0.0.1
+    tag: v2.29.1
   prometheusConfigReloadrImage:
     registry: docker.io
     repo: portworx
     imageName: prometheus-config-reloader
-    tag: v0.34.0
+    tag: v0.50.0
   prometheusOperatorImage:
     registry: docker.io
     repo: portworx
     imageName: prometheus-operator
-    tag: v0.34.0
+    tag: v0.50.0
   memcachedMetricsImage:
     registry: docker.io
     repo: portworx