Add version upgrade related helm changes

wso2 · Mar 25, 2024 · 437447f · 437447f
1 parent a0e6f15
commit 437447f
Show file tree

Hide file tree

Showing 10 changed files with 430 additions and 310 deletions.
diff --git a/helm-charts/README.md b/helm-charts/README.md
diff --git a/helm-charts/Version-Upgrade.md b/helm-charts/Version-Upgrade.md
@@ -0,0 +1,3 @@
+# Version Upgrade APK
+
+helm template test . -f version-upgrade-values.yaml && helm show crds . > t.yaml
diff --git a/helm-charts/templates/crds/dp.wso2.com_apis.yaml b/helm-charts/templates/crds/dp.wso2.com_apis.yaml
@@ -1,4 +1,4 @@
----
+{{- if not .Values.skipCrds }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -374,3 +374,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end}}
diff --git a/helm-charts/templates/data-plane/config-deployer/config-ds-prometheus-jmx-configmap.yaml b/helm-charts/templates/data-plane/config-deployer/config-ds-prometheus-jmx-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
 # Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
 #
 # WSO2 LLC. licenses this file to you under the Apache License,
@@ -29,3 +30,4 @@ data:
         help: Operating System $1
         attrNameSnakeCase: true
         type: GAUGE
+{{- end -}}
diff --git a/helm-charts/templates/data-plane/gateway-components/adapter/gateway-class.yaml b/helm-charts/templates/data-plane/gateway-components/adapter/gateway-class.yaml
@@ -1,3 +1,20 @@
+{{- if or .Values.wso2.apk.dp.enabled .Values.wso2.apk.cp.enabled }}
+# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
+#
+# WSO2 LLC. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
 metadata:
@@ -8,3 +25,4 @@ metadata:
   {{- end }}
 spec:
   controllerName: "wso2.com/apk-gateway-default"
+{{- end -}}
diff --git a/...ata-plane/gateway-components/common-controller/common-controller-sts-shared-auth-key.yaml b/...ata-plane/gateway-components/common-controller/common-controller-sts-shared-auth-key.yaml
@@ -1,3 +1,5 @@
+{{- if or .Values.wso2.apk.dp.enabled .Values.wso2.apk.cp.enabled }}
+
 # Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
 #
 # WSO2 LLC. licenses this file to you under the Apache License,
@@ -22,3 +24,4 @@ metadata:
   name: {{ template "apk-helm.resource.prefix" . }}-sts-shared-auth-key
   namespace: {{ .Release.Namespace }}
 type: Opaque
+{{- end -}}
diff --git a/...rts/templates/data-plane/gateway-components/gateway-runtime/prometheus-jmx-configmap.yaml b/...rts/templates/data-plane/gateway-components/gateway-runtime/prometheus-jmx-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
 # Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
 #
 # WSO2 LLC. licenses this file to you under the Apache License,
@@ -44,4 +45,5 @@ data:
         name: os_$1
         help: Operating System $1
         attrNameSnakeCase: true
-        type: GAUGE
+        type: GAUGE
+{{- end -}}
diff --git a/helm-charts/templates/idp/idp-ds/idp-ds-prometheus-jmx-configmap.yaml b/helm-charts/templates/idp/idp-ds/idp-ds-prometheus-jmx-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
 # Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
 #
 # WSO2 LLC. licenses this file to you under the Apache License,
@@ -29,3 +30,4 @@ data:
         help: Operating System $1
         attrNameSnakeCase: true
         type: GAUGE
+{{- end -}}
diff --git a/helm-charts/values.yaml.template b/helm-charts/values.yaml.template
@@ -337,7 +337,6 @@ wso2:
               poolMaxConnIdleTime: "1h"
               poolHealthCheckPeriod: "1m"
               poolMaxConnLifetimeJitter: "1s"
-      type
       ratelimiter:
         # -- Enable the deployment of the Rate Limiter
         enabled: true
@@ -872,3 +871,6 @@ redis:
   auth:
     # -- Enable password authentication	
     enabled: false
+
+# -- Skip generate of CRD templates
+skipCrds: false
diff --git a/helm-charts/version-upgrade-values.yaml b/helm-charts/version-upgrade-values.yaml
@@ -0,0 +1,48 @@
+# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
+#
+# WSO2 LLC. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+wso2:
+  apk:
+    cp:
+      enabled: false
+    webhooks:
+      validatingwebhookconfigurations: false
+      mutatingwebhookconfigurations: false
+    auth:
+      enabled: false
+      enableServiceAccountCreation: false
+      enableClusterRoleCreation: false
+    dp:
+      enabled: false        
+
+idp:
+  enabled: false
+
+gatewaySystem:
+  enabled: false
+  enableServiceAccountCreation: false
+  enableClusterRoleCreation: false
+
+certmanager:
+  enabled: false
+  enableClusterIssuer: false
+  enableRootCa: false
+
+postgresql:
+  enabled: false
+
+redis:
+  enabled: false