From cadb9dea7fd802a5cc0010c0e6e006a06ab98ecb Mon Sep 17 00:00:00 2001 From: ace Date: Mon, 15 Nov 2021 01:17:04 +0300 Subject: [PATCH] update postgres-operator-ui to v1.7.1 --- postgres-operator-ui/Chart.yaml | 4 +- postgres-operator-ui/index.yaml | 73 ++++++++++++++++--- .../templates/deployment.yaml | 13 +++- postgres-operator-ui/templates/ingress.yaml | 15 +++- postgres-operator-ui/templates/service.yaml | 1 + .../templates/serviceaccount.yaml | 1 + postgres-operator-ui/values.yaml | 35 ++++++++- 7 files changed, 122 insertions(+), 20 deletions(-) diff --git a/postgres-operator-ui/Chart.yaml b/postgres-operator-ui/Chart.yaml index e9c1086..9e38f21 100644 --- a/postgres-operator-ui/Chart.yaml +++ b/postgres-operator-ui/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: postgres-operator-ui -version: 1.6.3 -appVersion: 1.6.3 +version: 1.7.1 +appVersion: 1.7.1 home: https://github.com/zalando/postgres-operator description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience keywords: diff --git a/postgres-operator-ui/index.yaml b/postgres-operator-ui/index.yaml index f76bfcb..f0005e0 100644 --- a/postgres-operator-ui/index.yaml +++ b/postgres-operator-ui/index.yaml @@ -1,10 +1,57 @@ apiVersion: v1 entries: postgres-operator-ui: + - apiVersion: v1 + appVersion: 1.7.1 + created: "2021-11-03T11:44:00.75040818+01:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience + digest: 97aed1a1d37cd5f8441eea9522f38e56cc829786ad2134c437a5e6a15c995869 + home: https://github.com/zalando/postgres-operator + keywords: + - postgres + - operator + - ui + - cloud-native + - patroni + - spilo + maintainers: + - email: opensource@zalando.de + name: Zalando + name: postgres-operator-ui + sources: + - https://github.com/zalando/postgres-operator + urls: + - postgres-operator-ui-1.7.1.tgz + version: 1.7.1 + - apiVersion: v1 + appVersion: 1.7.0 + created: "2021-11-03T11:44:00.748544296+01:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience + digest: 37fba1968347daad393dbd1c6ee6e5b6a24d1095f972c0102197531c62dcada8 + home: https://github.com/zalando/postgres-operator + keywords: + - postgres + - operator + - ui + - cloud-native + - patroni + - spilo + maintainers: + - email: opensource@zalando.de + name: Zalando + name: postgres-operator-ui + sources: + - https://github.com/zalando/postgres-operator + urls: + - postgres-operator-ui-1.7.0.tgz + version: 1.7.0 - apiVersion: v1 appVersion: 1.6.3 - created: "2021-05-27T19:04:33.425637932+02:00" - description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience + created: "2021-11-03T11:44:00.745261041+01:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience digest: 08b810aa632dcc719e4785ef184e391267f7c460caa99677f2d00719075aac78 home: https://github.com/zalando/postgres-operator keywords: @@ -25,8 +72,9 @@ entries: version: 1.6.3 - apiVersion: v1 appVersion: 1.6.2 - created: "2021-05-27T19:04:33.422124263+02:00" - description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience + created: "2021-11-03T11:44:00.743617168+01:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience digest: 14d1559bb0bd1e1e828f2daaaa6f6ac9ffc268d79824592c3589b55dd39241f6 home: https://github.com/zalando/postgres-operator keywords: @@ -47,8 +95,9 @@ entries: version: 1.6.2 - apiVersion: v1 appVersion: 1.6.1 - created: "2021-05-27T19:04:33.419640902+02:00" - description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience + created: "2021-11-03T11:44:00.741913772+01:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience digest: 3d321352f2f1e7bb7450aa8876e3d818aa9f9da9bd4250507386f0490f2c1969 home: https://github.com/zalando/postgres-operator keywords: @@ -69,8 +118,9 @@ entries: version: 1.6.1 - apiVersion: v1 appVersion: 1.6.0 - created: "2021-05-27T19:04:33.41788193+02:00" - description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience + created: "2021-11-03T11:44:00.740290409+01:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience digest: 1e0aa1e7db3c1daa96927ffbf6fdbcdb434562f961833cb5241ddbe132220ee4 home: https://github.com/zalando/postgres-operator keywords: @@ -91,8 +141,9 @@ entries: version: 1.6.0 - apiVersion: v1 appVersion: 1.5.0 - created: "2021-05-27T19:04:33.416056821+02:00" - description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience + created: "2021-11-03T11:44:00.738607341+01:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience digest: c91ea39e6d51d57f4048fb1b6ec53b40823f2690eb88e4e4f1a036367b9fdd61 home: https://github.com/zalando/postgres-operator keywords: @@ -111,4 +162,4 @@ entries: urls: - postgres-operator-ui-1.5.0.tgz version: 1.5.0 -generated: "2021-05-27T19:04:33.41380858+02:00" +generated: "2021-11-03T11:44:00.736383918+01:00" diff --git a/postgres-operator-ui/templates/deployment.yaml b/postgres-operator-ui/templates/deployment.yaml index 9a1df3a..8942539 100644 --- a/postgres-operator-ui/templates/deployment.yaml +++ b/postgres-operator-ui/templates/deployment.yaml @@ -7,6 +7,7 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }} name: {{ template "postgres-operator-ui.fullname" . }} + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: @@ -43,13 +44,13 @@ spec: - name: "APP_URL" value: "http://localhost:8081" - name: "OPERATOR_API_URL" - value: {{ .Values.envs.operatorApiUrl }} + value: {{ .Values.envs.operatorApiUrl | quote }} - name: "OPERATOR_CLUSTER_NAME_LABEL" - value: {{ .Values.envs.operatorClusterNameLabel }} + value: {{ .Values.envs.operatorClusterNameLabel | quote }} - name: "RESOURCES_VISIBLE" - value: "{{ .Values.envs.resourcesVisible }}" + value: {{ .Values.envs.resourcesVisible | quote }} - name: "TARGET_NAMESPACE" - value: "{{ .Values.envs.targetNamespace }}" + value: {{ .Values.envs.targetNamespace | quote }} - name: "TEAMS" value: |- [ @@ -70,8 +71,12 @@ spec: "resources_visible": true, "users_visible": true, "postgresql_versions": [ + "14", "13", "12", "11" ] } + {{- if .Values.extraEnvs }} + {{- .Values.extraEnvs | toYaml | nindent 12 }} + {{- end }} diff --git a/postgres-operator-ui/templates/ingress.yaml b/postgres-operator-ui/templates/ingress.yaml index 73fa2e8..21e7dbe 100644 --- a/postgres-operator-ui/templates/ingress.yaml +++ b/postgres-operator-ui/templates/ingress.yaml @@ -1,7 +1,10 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "postgres-operator-ui.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} + +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 @@ -9,6 +12,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace }} labels: app.kubernetes.io/name: {{ template "postgres-operator-ui.name" . }} helm.sh/chart: {{ template "postgres-operator-ui.chart" . }} @@ -36,9 +40,18 @@ spec: paths: {{- range .paths }} - path: {{ . }} + {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}} + pathType: ImplementationSpecific + backend: + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else -}} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end -}} {{- end }} {{- end }} {{- end }} diff --git a/postgres-operator-ui/templates/service.yaml b/postgres-operator-ui/templates/service.yaml index bc40fbb..e146037 100644 --- a/postgres-operator-ui/templates/service.yaml +++ b/postgres-operator-ui/templates/service.yaml @@ -7,6 +7,7 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }} name: {{ template "postgres-operator-ui.fullname" . }} + namespace: {{ .Release.Namespace }} spec: ports: - port: {{ .Values.service.port }} diff --git a/postgres-operator-ui/templates/serviceaccount.yaml b/postgres-operator-ui/templates/serviceaccount.yaml index 4c5a255..94a9ca5 100644 --- a/postgres-operator-ui/templates/serviceaccount.yaml +++ b/postgres-operator-ui/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "postgres-operator-ui.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: app.kubernetes.io/name: {{ template "postgres-operator-ui.name" . }} helm.sh/chart: {{ template "postgres-operator-ui.chart" . }} diff --git a/postgres-operator-ui/values.yaml b/postgres-operator-ui/values.yaml index c9f5214..06004b1 100644 --- a/postgres-operator-ui/values.yaml +++ b/postgres-operator-ui/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: registry: registry.opensource.zalan.do repository: acid/postgres-operator-ui - tag: v1.6.3 + tag: v1.7.1 pullPolicy: "IfNotPresent" # Optionally specify an array of imagePullSecrets. @@ -48,6 +48,36 @@ envs: teams: - "acid" +# configure extra UI ENVs +# Extra ENVs are writen in kubenertes format and added "as is" to the pod's env variables +# https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/ +# https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#environment-variables +# UI specific env variables can be found here: https://github.com/zalando/postgres-operator/blob/master/ui/operator_ui/main.py +extraEnvs: + [] + # Exemple of settings to make snapshot view working in the ui when using AWS + # - name: WALE_S3_ENDPOINT + # value: https+path://s3.us-east-1.amazonaws.com:443 + # - name: SPILO_S3_BACKUP_PREFIX + # value: spilo/ + # - name: AWS_ACCESS_KEY_ID + # valueFrom: + # secretKeyRef: + # name: + # key: AWS_ACCESS_KEY_ID + # - name: AWS_SECRET_ACCESS_KEY + # valueFrom: + # secretKeyRef: + # name: + # key: AWS_SECRET_ACCESS_KEY + # - name: AWS_DEFAULT_REGION + # valueFrom: + # secretKeyRef: + # name: + # key: AWS_DEFAULT_REGION + # - name: SPILO_S3_BACKUP_BUCKET + # value: + # configure UI service service: type: "ClusterIP" @@ -59,7 +89,8 @@ service: # configure UI ingress. If needed: "enabled: true" ingress: enabled: false - annotations: {} + annotations: + {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: