chore(addons): support update addons (#21)

Author: EamonZhang

addons/cloudbeaver/23/chart/cloudbeaver/templates/deployment.yaml

@@ -105,34 +105,11 @@ spec:
             - name: data
               mountPath: {{ .Values.persistence.mountPath | quote }}
       volumes:
-{{- if not .Values.persistence.enabled }}
         - name: data
+       {{- if .Values.persistence.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.persistence.existingClaim | default (include "common.names.fullname" .) }}
+        {{- else }}
           emptyDir: {}
-{{- end }}
-{{- if .Values.persistence.enabled }}
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-        annotations:
-        {{- if .Values.persistence.annotations }}
-{{ toYaml .Values.persistence.annotations | indent 8 }}
         {{- end }}
-        labels:
-          application: {{ include "common.names.fullname" . }}
-          release: {{ .Release.Name }}
-          heritage: {{ .Release.Service }}
-      spec:
-        accessModes:
-{{ toYaml .Values.persistence.accessModes | indent 8 }}
-        resources:
-          requests:
-            storage: "{{ .Values.persistence.size }}"
-      {{- if .Values.persistence.storageClass }}
-      {{- if (eq "-" .Values.persistence.storageClass) }}
-        storageClassName: ""
-      {{- else }}
-        storageClassName: "{{ .Values.persistence.storageClass }}"
-      {{- end }}
-      {{- end }}
-  {{- end }}
 

addons/cloudbeaver/23/chart/cloudbeaver/templates/pvc.yaml

@@ -2,7 +2,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ printf "%s-binding" (include "common.names.fullname" .) }}
+  name: {{ include "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}

addons/grafana/10/chart/grafana/templates/_helpers.tpl

@@ -57,6 +57,14 @@ Return the Grafana admin password key
 {{- end -}}
 {{- end -}}
 
+{{- define "admin.passwordValue" -}}
+{{- if .Values.admin.password }}
+    {{- .Values.admin.password -}}
+{{- else -}}
+  {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "GF_SECURITY_ADMIN_PASSWORD")  -}}
+{{- end -}}
+{{- end }}
+
 {{/*
 Return true if a secret object should be created
 */}}
@@ -67,6 +75,20 @@ Return true if a secret object should be created
 {{- end -}}
 {{- end -}}
 
+{{/*
+Returns the available value for certain key in an existing secret (if it exists),
+otherwise it generates a random value.
+*/}}
+{{- define "getValueFromSecret" }}
+{{- $len := (default 16 .Length) | int -}}
+{{- $obj := (lookup "v1" "Secret" .Namespace .Name).data -}}
+{{- if $obj }}
+{{- index $obj .Key | b64dec -}}
+{{- else -}}
+{{- randAlphaNum $len -}}
+{{- end -}}
+{{- end }}
+
 {{/*
 Return the Grafana SMTP credentials secret
 */}}

addons/grafana/10/chart/grafana/templates/secret.yaml

@@ -11,6 +11,6 @@ metadata:
     app.kubernetes.io/component: grafana
 type: Opaque
 data:
-  GF_SECURITY_ADMIN_PASSWORD: {{ ternary (randAlphaNum 10) .Values.admin.password (empty .Values.admin.password) | b64enc | quote }}
+  GF_SECURITY_ADMIN_PASSWORD:  {{ include "admin.passwordValue" . | b64enc | quote }}
   GF_SECURITY_ADMIN_USER: {{ .Values.admin.user | b64enc |quote }}
 {{- end }}

addons/grafana/10/chart/grafana/values.yaml

@@ -575,7 +575,7 @@ serviceAccount:
 service:
   ## @param service.type Kubernetes Service type
   ##
-  type: ClusterIP
+  type: LoadBalancer
   ## @param service.clusterIP Grafana service Cluster IP
   ## e.g.:
   ## clusterIP: None

addons/grafana/10/meta.yaml

@@ -1,5 +1,5 @@
-name: Grafana
-version: 7.0
+name: grafana
+version: "10"
 id: fff5b6c7-ed85-429b-8265-493e40cc53c7
 description: "grafana"
 displayName: "grafana"
@@ -9,12 +9,14 @@ metadata:
     name: drycc
     supportURL: http://grafana.io/
   documentationURL: https://github.com/drycc-addons/
-tags: cloudbeaver
+tags: grafana
 bindable: true
 instances_retrievable: true
 bindings_retrievable: true
-plan_updateable: false
+plan_updateable: true
 allow_parameters:
+- name: "networkPolicy.allowNamespaces"
+  description: "networkPolicy allowNamespaces config for values.yaml"
 - name: "service.type"
   description: "service type config for values.yaml"
 archive: false

addons/grafana/10/plans/standard-5/bind.yaml

@@ -1,30 +1,29 @@
 credential:
-  {{- if (eq .Values.router.service.type "LoadBalancer") }}
-  - name: HOST
+  {{- if (eq .Values.service.type "LoadBalancer") }}
+  - name: EXTRANET_HOST
     valueFrom:
       serviceRef:
-        name: {{ printf "%s-router" (include "common.names.fullname" .) }}
+        name: {{ include "common.names.fullname" . }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  {{- else if (eq .Values.service.type "ClusterIP") }}
+   {{- end }}
   - name: HOST
     valueFrom:
       serviceRef:
         name: {{ include "common.names.fullname" . }}
         jsonpath: '{ .spec.clusterIP }'
-  {{- end }}
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-admin
+        name: {{ include "common.names.fullname" . }}-admin
         jsonpath: '{ .data.GF_SECURITY_ADMIN_PASSWORD }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-admin
+        name: {{ include "common.names.fullname" . }}-admin
         jsonpath: '{ .data.GF_SECURITY_ADMIN_USER }' 
   - name: PORT
     valueFrom:  
       serviceRef:
-        name: {{ template "common.names.fullname" . }}
+        name: {{ include "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="http")].port }'
 

addons/postgresql-cluster/15/chart/postgresql-cluster/Chart.yaml

@@ -25,4 +25,4 @@ name: postgresql
 sources:
   - https://github.com/drycc-addons/
   - https://www.postgresql.org/
-version: 15.3.1
+version: 15.4.1

addons/postgresql-cluster/15/chart/postgresql-cluster/README.md

@@ -71,13 +71,23 @@ backup:
 
 - Login database web with admin user & password
 
+- Change administrator initial password 
+```
+ALTER USER  administrator WITH ENCRYPTED PASSWORD 'newpassword';
+```
+- View total connections number in postgresql cluster;
+```
+show max_connections ;
+```
 - CREATE APP USER
 ```
-CREATE USER `my_user` WITH CONNECTION LIMIT `conn_limit` LOGIN ENCRYPTED PASSWORD 'password';
+CREATE USER `myuser` WITH CONNECTION LIMIT `conn limit` LOGIN ENCRYPTED PASSWORD 'password';
+GRANT `myuser` to administrator ;
 ```
 - CREATE APP DATABASE
 ```
-CREATE DATABASE `my_db` OWNER `my_user`;
+CREATE DATABASE `mydb` OWNER `myuser`;
+
 ```
 - CREATE EXTENSIONS
 ```

addons/postgresql-cluster/15/chart/postgresql-cluster/templates/_helpers.tpl

@@ -189,7 +189,7 @@ Get the administrator password ;
 {{- if .Values.adminRole.password }}
     {{- .Values.adminRole.password -}}
 {{- else -}}
-  {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "password-replication")  -}}
+  {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "admin-password")  -}}
 {{- end -}}
 {{- end }}