Merge pull request #1920 from CrowleyRajapakse/newmain3

Removing management server and cp related helm values

helm-charts/templates/idp/idp-ds/idp-ds-deployment.yaml

@@ -38,7 +38,7 @@ spec:
       initContainers:
         - name: init-db
           image: busybox:1.32
-          command: ['sh', '-c', 'echo -e "Checking for the availability of DB Server deployment"; while ! nc -z "{{ .Values.wso2.apk.cp.database.host }}" {{.Values.wso2.apk.cp.database.port }}; do sleep 1; printf "-"; done; echo -e "  >> DB Server has started";']
+          command: ['sh', '-c', 'echo -e "Checking for the availability of DB Server deployment"; while ! nc -z "{{ .Values.idp.database.host }}" {{.Values.idp.database.port }}; do sleep 1; printf "-"; done; echo -e "  >> DB Server has started";']
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

helm-charts/values.yaml

@@ -46,45 +46,6 @@ wso2:
       #   jwksEndpoint: "https://idp.am.wso2.com:9095/oauth2/jwks"
       #   secretName: "wso2apk-idp-signing"
       #   fileName: "idp.crt"
-    cp:
-      enabled: true
-      database:
-        driver: "org.postgresql.Driver"
-        url: "jdbc:postgresql://wso2apk-db-service:5432/WSO2AM_DB"
-        host: "wso2apk-db-service"
-        port: 5432
-        databaseName: "WSO2AM_DB"
-        username: "wso2carbon"
-        secretName: "apk-db-secret"
-        secretKey: "DB_PASSWORD"
-        validationQuery: "SELECT 1"
-        validationTimeout: 250
-      managementServer:
-        deployment:
-          resources:
-            requests:
-              memory: "64Mi"
-              cpu: "50m"
-            limits:
-              memory: "256Mi"
-              cpu: "200m"
-          strategy: Recreate
-          replicas: 1
-          imagePullPolicy: Always
-          image: wso2/apk-management-server:latest
-          readinessProbe:
-            initialDelaySeconds: 20
-            periodSeconds: 20
-            failureThreshold: 5
-          livenessProbe:
-            initialDelaySeconds: 20
-            periodSeconds: 20
-            failureThreshold: 5
-        # configs:
-        #   tls:
-        #     secretName: "management-server-cert"
-        #     certKeyFilename: "tls.key"
-        #     certFilename: "certchain.crt"
     dp:
       enabled: true
       gateway:

helm-charts/values.yaml.template

@@ -68,73 +68,6 @@ wso2:
         secretName: ""
         # -- IDP jwt signing certificate file name
         fileName: ""
-    cp:
-      # -- Enabled control plane.
-      enabled: true
-      database:
-        # -- Database Driver class.
-        driver: "org.postgresql.Driver"
-        # -- Database URL.
-        url: "jdbc:postgresql://wso2apk-db-service:5432/WSO2AM_DB"
-        # -- Database Host.
-        host: "wso2apk-db-service"
-        # -- Database Port.
-        port: 5432
-        # -- Database Name.
-        databaseName: "WSO2AM_DB"
-        # -- Database Username.
-        username: "wso2carbon"
-        # -- Database Password secret name.
-        secretName: "apk-db-secret"
-        # -- Database Password secret key.
-        secretKey: "DB_PASSWORD"
-        # -- Database validation query.
-        validationQuery: "SELECT 1"
-        # -- Database validation timeout in ms.
-        validationTimeout: 250
-      managementServer:
-        deployment:
-          resources:
-            requests:
-              # -- CPU request for the container
-              memory: "128Mi"
-              # -- Memory request for the container
-              cpu: "100m"
-            limits:
-              # -- CPU limit for the container
-              memory: "1028Mi"
-              # -- Memory limit for the container
-              cpu: "1000m"
-          # -- Deployment strategy
-          strategy: Recreate
-          # -- Number of replicas
-          replicas: 1
-          # -- Image pull policy
-          imagePullPolicy: Always
-          # -- Image
-          image: wso2/apk-management-server:latest
-          readinessProbe:
-            # -- Number of seconds after the container has started before liveness probes are initiated.
-            initialDelaySeconds: 20
-            # -- How often (in seconds) to perform the probe.
-            periodSeconds: 20
-            # -- Minimum consecutive failures for the probe to be considered failed after having succeeded.
-            failureThreshold: 5
-          livenessProbe:
-            # -- Number of seconds after the container has started before liveness probes are initiated.
-            initialDelaySeconds: 20
-            # -- How often (in seconds) to perform the probe.
-            periodSeconds: 20
-            # -- Minimum consecutive failures for the probe to be considered failed after having succeeded.
-            failureThreshold: 5
-        configs:
-          tls:
-            # -- TLS secret name
-            secretName: "management-server-cert"
-            # -- TLS key file name
-            certKeyFilename: "tls.key"
-            # -- TLS certificate file name
-            certFilename: "certchain.crt"
     dp:
      # -- Enable the deployment of the Data Plane
       enabled: true