Merge branch 'release-ibm-helm-17' into 'master'

Release ibm helm 17 : Helm Chart Resource Changed

See merge request !319

devops/ibm/ibm-partition-deploy/files/configMap_update_script.sh

@@ -6,29 +6,33 @@ export HOME=/tmp/cm-config
 
 cd /tmp/cm-config
 
-COUCH_SECRET_NAME=$(oc get secrets |grep Opaque| grep couchdb| awk '{ print $1 }')
+COUCH_SECRET_NAME=$(kubectl get secrets |grep Opaque| grep couchdb| awk '{ print $1 }')
 
-VALUE_COUCH_SECRET=$(oc get secret $COUCH_SECRET_NAME -o jsonpath="{ .data.adminPassword}" |base64 -d)
+VALUE_COUCH_SECRET=$(kubectl get secret $COUCH_SECRET_NAME -o jsonpath="{ .data.adminPassword}" |base64 -d)
 
-oc patch cm partition-config -p "{\"data\": {\"ibm.db.password\": \"$VALUE_COUCH_SECRET\"}}"
+kubectl patch cm partition-config -p "{\"data\": {\"ibm.db.password\": \"$VALUE_COUCH_SECRET\"}}"
 
-KEYCLOAK_LB_IP=$(oc get svc keycloak-discovery-lb -o jsonpath="{ .status.loadBalancer.ingress[0].ip}")
+KEYCLOAK_LB_IP=$(kubectl get svc keycloak-discovery-lb -o jsonpath="{ .status.loadBalancer.ingress[0].ip}")
 
-KEYCLOAK_HOSTNAME=$(oc get svc keycloak-discovery-lb -o jsonpath="{ .status.loadBalancer.ingress[0].hostname}")
+KEYCLOAK_HOSTNAME=$(kubectl get svc keycloak-discovery-lb -o jsonpath="{ .status.loadBalancer.ingress[0].hostname}")
 
 KEYCLOAK_LB_IP=${KEYCLOAK_LB_IP:=$KEYCLOAK_HOSTNAME}
 
-oc patch cm partition-config -p "{\"data\": {\"keycloak.auth-server-url\": \"http://$KEYCLOAK_LB_IP/auth\"}}"
+kubectl patch cm partition-config -p "{\"data\": {\"keycloak.auth-server-url\": \"http://$KEYCLOAK_LB_IP/auth\"}}"
 
-oc patch cm partition-config -p "{\"data\": {\"ibm.keycloak.endpoint_url\": \"http://$KEYCLOAK_LB_IP\"}}"
+kubectl patch cm partition-config -p "{\"data\": {\"ibm.keycloak.endpoint_url\": \"http://$KEYCLOAK_LB_IP\"}}"
 
-oc patch cm partition-config -p "{\"data\": {\"partition.keycloak.url\": \"$KEYCLOAK_LB_IP\"}}"
+kubectl patch cm partition-config -p "{\"data\": {\"partition.keycloak.url\": \"$KEYCLOAK_LB_IP\"}}"
 
-MINIO_LB_IP=$(kubectl get svc osdu-deploy-minio -o jsonpath="{ .status.loadBalancer.ingress[0].ip}")
+MINIO_SVC=$(kubectl get svc | grep minio | awk {'print $1'})
 
-MINIO_LB_HOSTNAME=$(kubectl get svc osdu-deploy-minio -o jsonpath="{ .status.loadBalancer.ingress[0].hostname}")
+echo "MinIo Service is : $MINIO_SVC"
 
-MINIO_LB_PORT=$(kubectl get svc osdu-deploy-minio -o=jsonpath="{.spec.ports[?(@.name=='minio-api')].port}")
+MINIO_LB_IP=$(kubectl get svc $MINIO_SVC -o jsonpath="{ .status.loadBalancer.ingress[0].ip}")
+
+MINIO_LB_HOSTNAME=$(kubectl get svc $MINIO_SVC -o jsonpath="{ .status.loadBalancer.ingress[0].hostname}")
+
+MINIO_LB_PORT=$(kubectl get svc $MINIO_SVC -o=jsonpath="{.spec.ports[?(@.name=='minio-api')].port}")
 
 MINIO_LB_PORT=${MINIO_LB_PORT:=9000}
 
@@ -36,7 +40,7 @@ MINIO_LB_IP=${MINIO_LB_IP:=$MINIO_LB_HOSTNAME}
 
 kubectl patch cm partition-config -p "{\"data\": {\"ibm.cos.endpoint_url\": \"http://$MINIO_LB_IP:$MINIO_LB_PORT\"}}"
 
-oc patch RequestAuthentication core-request-authn  --type json   -p='[{"op": "replace", "path": "/spec/jwtRules/0/issuer", "value":"http://'$KEYCLOAK_LB_IP'/auth/realms/OSDU"}]'
+kubectl patch RequestAuthentication core-request-authn  --type json   -p='[{"op": "replace", "path": "/spec/jwtRules/0/issuer", "value":"http://'$KEYCLOAK_LB_IP'/auth/realms/OSDU"}]'
 
 echo "Waiting for Keycloak Server to come up"
 
@@ -46,10 +50,10 @@ sleep 10
 
 KEYCLOAK_CERT=$(curl http://keycloak-discovery:8080/auth/realms/OSDU/protocol/openid-connect/certs)
 
-oc get RequestAuthentication core-request-authn -o yaml | sed "s|jwksUri: *.*|jwks: ''|g" |  oc apply -f -
+kubectl get RequestAuthentication core-request-authn -o yaml | sed "s|jwksUri: *.*|jwks: ''|g" |  kubectl apply -f -
 
-oc get RequestAuthentication core-request-authn -o yaml | sed "s|jwks: *.*|jwks: '$KEYCLOAK_CERT'|g" |  oc apply -f -
+kubectl get RequestAuthentication core-request-authn -o yaml | sed "s|jwks: *.*|jwks: '$KEYCLOAK_CERT'|g" |  kubectl apply -f -
 
-oc get EnvoyFilter header-2-add-user-from-keycloak-token -o yaml | sed "s/x.x.x.x/$KEYCLOAK_LB_IP/g" | oc apply -f -
+kubectl get EnvoyFilter header-2-add-user-from-keycloak-token -o yaml | sed "s/x.x.x.x/$KEYCLOAK_LB_IP/g" | kubectl apply -f -
 
-oc wait --for=condition=complete --timeout=120s job/amq-pvc-permissions | oc get ActiveMQArtemis ex-aao -o yaml | sed "s/size: 0/size: 1/g" | oc apply -f -
+kubectl wait --for=condition=complete --timeout=120s job/amq-pvc-permissions | kubectl get ActiveMQArtemis ex-aao -o yaml | sed "s/size: 0/size: 1/g" | kubectl apply -f -