Merge pull request #329 from Sachin-Mamoru/6.1.0-helmcharts

Add is-6.1.0 pattern-1 helm charts changes to master branch

advanced/databases/mysql-is/Chart.yaml

@@ -15,5 +15,5 @@ apiVersion: v1
 appVersion: "5.7"
 description: A Helm chart for MySQL based deployment of WSO2 Identity And Access Management Datasources
 name: mysql-is
-version: 5.11.0-5
+version: 6.1.0-1
 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg

advanced/is-pattern-1/Chart.yaml

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 apiVersion: v1
-appVersion: "5.11.0"
+appVersion: "6.1.0"
 description: A Helm chart for the deployment of WSO2 Identity And Access Management pattern 1
 name: is-pattern-1
-version: 5.11.0-5
+version: 6.1.0-1
 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg

advanced/is-pattern-1/README.md

@@ -20,8 +20,7 @@ For advanced details on the deployment pattern, please refer the official
 
 * WSO2 product Docker images used for the Kubernetes deployment.
 
-  WSO2 product Docker images available at [DockerHub](https://hub.docker.com/u/wso2/) package General Availability (GA)
-  versions of WSO2 products with no [WSO2 Updates](https://wso2.com/updates).
+  From Identity Server 6.0.0 onwards, WSO2 product Docker images are no longer available at [DockerHub](https://hub.docker.com/u/wso2/). 
 
   For a production grade deployment of the desired WSO2 product-version, it is highly recommended to use the relevant
   Docker image which packages WSO2 Updates, available at [WSO2 Private Docker Registry](https://docker.wso2.com/). In order
@@ -59,7 +58,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository]
  **Helm version 2**
 
  ```
- helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-5 --namespace <NAMESPACE>
+ helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 6.1.0-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
  ```
 
  **Helm version 3**
@@ -73,27 +72,10 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository]
  - Deploy the Kubernetes resources using the Helm Chart
 
     ```
-    helm install <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-5 --namespace <NAMESPACE>
+    helm install <RELEASE_NAME> wso2/is-pattern-1 --version 6.1.0-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
     ```
 
-The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub.
-
-If you are using WSO2 product Docker images available from WSO2 Private Docker Registry,
-please provide your WSO2 Subscription Credentials via input values (using `--set` argument). 
-
-Refer the following example.
-
- **Helm version 2**
-
-```
- helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-5 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
-```
-
- **Helm version 3**
-
-```
- helm install <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-5 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
-```
+Please provide your WSO2 Subscription Credentials via input values (using `--set` argument). 
 
 #### Install Chart From Source
 
@@ -108,12 +90,22 @@ Git repository. <br>
 git clone https://github.com/wso2/kubernetes-is.git
 ```
 
+##### Update dependencies of mysql-is chart
+```
+helm dependency update <HELM_HOME>/databases/mysql-is
+```
+
+##### Update dependencies of is-pattern-1 chart
+```
+helm dependency update <HELM_HOME>/is-pattern-1
+```
+
 ##### Deploy Helm chart for a clustered deployment of WSO2 Identity Server.
 
  **Helm version 2**
 
  ```
- helm install --dep-up --name <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --namespace <NAMESPACE>
+ helm install --name <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
  ```
 
  **Helm version 3**
@@ -127,20 +119,9 @@ git clone https://github.com/wso2/kubernetes-is.git
  - Deploy the Kubernetes resources using the Helm Chart
 
     ```
-    helm install <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --namespace <NAMESPACE> --dependency-update
+    helm install <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD> 
     ```
 
-The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub.
-
-If you are using WSO2 product Docker images available from WSO2 Private Docker Registry,
-please provide your WSO2 Subscription Credentials via input values (using `--set` argument). 
-
-Refer the following example.
-
-```
- helm install --name <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
-```
-
 ### 2. Obtain the external IP
 
 Obtain the external IP (`EXTERNAL-IP`) of the Identity Server Ingress resource, by listing down the Kubernetes Ingresses.

advanced/is-pattern-1/requirements.yaml

@@ -14,6 +14,6 @@
 
 dependencies:
   - name: mysql-is
-    version: "5.11.0-5"
-    repository: "https://helm.wso2.com"
+    version: "6.1.0-1"
+    repository: "file://../databases/mysql-is"
     condition: wso2.deployment.dependencies.mysql.enabled

advanced/is-pattern-1/templates/is/wso2is-pattern-1-identity-server-bin.yaml

@@ -64,14 +64,14 @@ data:
     OS400*) os400=true;;
     Darwin*) darwin=true
             if [ -z "$JAVA_VERSION" ] ; then
-                 JAVA_VERSION="CurrentJDK"
-               else
-                 echo "Using Java version: $JAVA_VERSION"
-               fi
-               if [ -z "$JAVA_HOME" ] ; then
-                 JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
-               fi
-               ;;
+                JAVA_VERSION="CurrentJDK"
+              else
+                echo "Using Java version: $JAVA_VERSION"
+              fi
+              if [ -z "$JAVA_HOME" ] ; then
+                JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+              fi
+              ;;
     esac
 
     # resolve links - $0 may be a softlink
@@ -234,9 +234,9 @@ data:
     # ---------- Handle the SSL Issue with proper JDK version --------------------
     java_version=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}')
     java_version_formatted=$(echo "$java_version" | awk -F. '{printf("%02d%02d",$1,$2);}')
-    if [ $java_version_formatted -lt 0107 ] || [ $java_version_formatted -gt 1100 ]; then
-       echo " Starting WSO2 Carbon (in unsupported JDK)"
-       echo " [ERROR] CARBON is supported only on JDK 1.7, 1.8, 9, 10 and 11"
+    if [ $java_version_formatted -lt 1100 ] || [ $java_version_formatted -gt 1700 ]; then
+      echo " Starting WSO2 Carbon (in unsupported JDK)"
+      echo " [ERROR] CARBON is supported only between JDK 11 and JDK 17"
     fi
 
     CARBON_XBOOTCLASSPATH=""
@@ -255,7 +255,11 @@ data:
     for f in "$CARBON_HOME"/bin/*.jar
     do
         if [ "$f" != "$CARBON_HOME/bin/*.jar" ];then
-            CARBON_CLASSPATH="$CARBON_CLASSPATH":$f
+          if [ -z "$CARBON_CLASSPATH" ];then
+                CARBON_CLASSPATH=$f
+          else
+                CARBON_CLASSPATH="$CARBON_CLASSPATH":$f
+          fi
         fi
     done
     for t in "$CARBON_HOME"/lib/*.jar
@@ -290,24 +294,21 @@ data:
     status=$START_EXIT_STATUS
 
     if [ -z "$JVM_MEM_OPTS" ]; then
-       java_version=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}')
-       JVM_MEM_OPTS="-Xms256m -Xmx1024m"
-       if [ "$java_version" \< "1.8" ]; then
+      java_version=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+      JVM_MEM_OPTS="-Xms256m -Xmx1024m"
+      if [ "$java_version" \< "1.8" ]; then
           JVM_MEM_OPTS="$JVM_MEM_OPTS -XX:MaxPermSize=256m"
-       fi
+      fi
     fi
     echo "Using Java memory options: $JVM_MEM_OPTS"
 
     #To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property.
     #   -Djava.rmi.server.hostname="your.IP.goes.here"
 
-    JAVA_VER_BASED_OPTS=""
+    JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED"
 
-    NASHRON_ARGS=""
-
-    if [ $java_version_formatted -ge 1100 ]; then
-     NASHRON_ARGS="--no-deprecation-warning"
-        JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
+    if [ $java_version_formatted -ge 1700 ]; then
+        JAVA_VER_BASED_OPTS=$JAVA_VER_BASED_OPTS" --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
     fi
 
 
@@ -347,11 +348,9 @@ data:
         -DworkerNode=false \
         -DenableCorrelationLogs=false \
         -Dhttpclient.hostnameVerifier="DefaultAndLocalhost" \
-        -Dorg.apache.xml.security.ignoreLineBreaks=false \
-        -Dnashorn.args="$NASHRON_ARGS" \
+    -Dorg.apache.xml.security.ignoreLineBreaks=false \
         -Dcarbon.new.config.dir.path="$CARBON_HOME/repository/resources/conf" \
-        -Djdk.tls.client.protocols=TLSv1.2 \
-        {{- if .Values.wso2.monitoring.enabled }}-javaagent:/home/wso2carbon/prometheus/jmx_prometheus_javaagent-0.12.0.jar=2222:/home/wso2carbon/prometheus/config.yaml \{{- end }}
         org.wso2.carbon.bootstrap.Bootstrap $*
         status=$?
     done
+

advanced/is-pattern-1/templates/is/wso2is-pattern-1-identity-server-conf.yaml

@@ -42,32 +42,26 @@ data:
     [user_store]
     type = "database_unique_id"
 
-    [database.user]
-    url = "jdbc:mysql://wso2is-mysql-db-service:3306/WSO2IS_SHARED_DB?autoReconnect=true&useSSL=false"
-    username = "wso2carbon"
-    password = "wso2carbon"
-    driver = "com.mysql.cj.jdbc.Driver"
-
-    [database.user.pool_options]
-    validationQuery = "SELECT 1"
-
-    [transport.https.properties]
-    proxyPort="443"
-
     [database.identity_db]
+    type = "mysql"
     url = "jdbc:mysql://wso2is-mysql-db-service:3306/WSO2IS_IDENTITY_DB?autoReconnect=true&useSSL=false"
     username = "wso2carbon"
     password = "wso2carbon"
     driver = "com.mysql.cj.jdbc.Driver"
-
     [database.identity_db.pool_options]
     validationQuery = "SELECT 1"
 
     [database.shared_db]
+    type = "mysql"
     url = "jdbc:mysql://wso2is-mysql-db-service:3306/WSO2IS_SHARED_DB?autoReconnect=true&useSSL=false"
     username = "wso2carbon"
     password = "wso2carbon"
     driver = "com.mysql.cj.jdbc.Driver"
+    [database.shared_db.pool_options]
+    validationQuery = "SELECT 1"
+
+    [transport.https.properties]
+    proxyPort="443"
 
     [truststore]
     file_name="client-truststore.jks"
@@ -80,32 +74,6 @@ data:
     [identity.auth_framework.endpoint]
     app_password= "dashboard"
 
-    [database.shared_db.pool_options]
-    validationQuery = "SELECT 1"
-
-    [database.bps_database]
-    url = "jdbc:mysql://wso2is-mysql-db-service:3306/WSO2IS_BPS_DB?autoReconnect=true&useSSL=false"
-    username = "wso2carbon"
-    password = "wso2carbon"
-    driver = "com.mysql.cj.jdbc.Driver"
-
-    [database.bps_database.pool_options]
-    validationQuery = "SELECT 1"
-
-    [[datasource]]
-    id = "WSO2ConsentDS"
-    url = "jdbc:mysql://wso2is-mysql-db-service:3306/WSO2IS_CONSENT_DB?autoReconnect=true&useSSL=false"
-    username = "wso2carbon"
-    password = "wso2carbon"
-    driver = "com.mysql.cj.jdbc.Driver"
-    pool_options.validationQuery="SELECT 1"
-    pool_options.maxActive=50
-    pool_options.maxWait = 60000 # wait in milliseconds
-    pool_options.testOnBorrow = true
-    pool_options.jmxEnabled = false
-    [authentication.consent]
-    data_source="jdbc/WSO2ConsentDS"
-
     [keystore.primary]
     name = "wso2carbon.jks"
     password = "wso2carbon"

advanced/is-pattern-1/values.yaml

@@ -47,10 +47,10 @@ wso2:
 
     wso2is:
       # Container image configurations
-      # If a custom image must be used, uncomment 'dockerRegistry' and provide its value
-      # dockerRegistry: ""
+      # If a custom image must be used, provide its value
+      dockerRegistry: "docker.wso2.com"
       imageName: "wso2is"
-      imageTag: "5.11.0"
+      imageTag: "6.1.0.0"
       # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images)
       imagePullPolicy: Always