Adjust sed command to work with Darwin and Linux platforms

wso2 · May 24, 2019 · bee88de · bee88de
1 parent e4aa80a
commit bee88de
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 28 deletions.
diff --git a/advanced/is-with-analytics/scripts/deploy.sh b/advanced/is-with-analytics/scripts/deploy.sh
@@ -53,22 +53,44 @@ if [[ ${REPLY} =~ ^[Yy]$ ]]; then
             exit 1
         fi
 
-        if ! ${SED} -i.bak -e '/serviceAccount/a \      imagePullSecrets:' \
-        ../is/identity-server-deployment.yaml \
-        ../is-analytics-dashboard/identity-server-analytics-dashboard-deployment.yaml \
-        ../is-analytics-worker/identity-server-analytics-worker-deployment.yaml; then
-            echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create \"imagePullSecrets:\" attribute"
-            exit 1
-        fi
-
-
-        if ! ${SED} -i.bak -e '/imagePullSecrets/a \      - name: wso2creds' \
-        ../is/identity-server-deployment.yaml \
-        ../is-analytics-dashboard/identity-server-analytics-dashboard-deployment.yaml \
-        ../is-analytics-worker/identity-server-analytics-worker-deployment.yaml; then
-            echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create secret name"
-            exit 1
-        fi
+        case "`uname`" in
+            Darwin*)
+                if ! ${SED} -i.bak -e '/serviceAccount/a \
+                \      imagePullSecrets:' \
+                ../is/identity-server-deployment.yaml \
+                ../is-analytics-dashboard/identity-server-analytics-dashboard-deployment.yaml \
+                ../is-analytics-worker/identity-server-analytics-worker-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create \"imagePullSecrets:\" attribute"
+                    exit 1
+                fi
+
+
+                if ! ${SED} -i.bak -e '/imagePullSecrets/a \
+                \      - name: wso2creds' \
+                ../is/identity-server-deployment.yaml \
+                ../is-analytics-dashboard/identity-server-analytics-dashboard-deployment.yaml \
+                ../is-analytics-worker/identity-server-analytics-worker-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create secret name"
+                    exit 1
+                fi;;
+            *)
+                if ! ${SED} -i.bak -e '/serviceAccount/a \      imagePullSecrets:' \
+                ../is/identity-server-deployment.yaml \
+                ../is-analytics-dashboard/identity-server-analytics-dashboard-deployment.yaml \
+                ../is-analytics-worker/identity-server-analytics-worker-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create \"imagePullSecrets:\" attribute"
+                    exit 1
+                fi
+
+
+                if ! ${SED} -i.bak -e '/imagePullSecrets/a \      - name: wso2creds' \
+                ../is/identity-server-deployment.yaml \
+                ../is-analytics-dashboard/identity-server-analytics-dashboard-deployment.yaml \
+                ../is-analytics-worker/identity-server-analytics-worker-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create secret name"
+                    exit 1
+                fi
+        esac
     fi
 elif [[ ${REPLY} =~ ^[Nn]$ || -z "${REPLY}" ]]; then
      HAS_SUBSCRIPTION=1

diff --git a/advanced/is/identity-server-deployment.yaml b/advanced/is/identity-server-deployment.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
       - name: wso2is
-        image: wso2/wso2is:5.8.0
+        image: docker.wso2.com/wso2is:5.8.0
         livenessProbe:
           exec:
             command:
@@ -74,6 +74,8 @@ spec:
         - name: shared-tenants-persistent-disk
           mountPath: /home/wso2carbon/wso2is-5.8.0/repository/tenants
       serviceAccountName: "wso2svc-account"
+      imagePullSecrets:
+      - name: wso2creds
       volumes:
       - name: identity-server-conf
         configMap:

diff --git a/advanced/is/scripts/deploy.sh b/advanced/is/scripts/deploy.sh
@@ -29,7 +29,7 @@ function echoBold () {
     ${ECHO} -e $'\e[1m'"${1}"$'\e[0m'
 }
 
-read -p "Do you have a WSO2 Subscription? (Y/N)" -n 1 -r
+read -p "Do you have a WSO2 Subscription? (y/N)" -n 1 -r
 ${ECHO}
 
 if [[ ${REPLY} =~ ^[Yy]$ ]]; then
@@ -47,16 +47,32 @@ if [[ ${REPLY} =~ ^[Yy]$ ]]; then
             exit 1
         fi
 
-        if ! ${SED} -i.bak -e '/serviceAccount/a \      imagePullSecrets:' ../identity-server-deployment.yaml; then
-            echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create \"imagePullSecrets:\" attribute"
-            exit 1
-        fi
-
-
-        if ! ${SED} -i.bak -e '/imagePullSecrets/a \      - name: wso2creds' ../identity-server-deployment.yaml; then
-            echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create secret name"
-            exit 1
-        fi
+        case "`uname`" in
+            Darwin*)
+                if ! ${SED} -i.bak -e '/serviceAccount/a \
+                \      imagePullSecrets:' ../identity-server-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create \"imagePullSecrets:\" attribute"
+                    exit 1
+                fi
+
+
+                if ! ${SED} -i.bak -e '/imagePullSecrets/a \
+                \      - name: wso2creds' ../identity-server-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create secret name"
+                    exit 1
+                fi;;
+            *)
+                if ! ${SED} -i.bak -e '/serviceAccount/a \      imagePullSecrets:' ../identity-server-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create \"imagePullSecrets:\" attribute"
+                    exit 1
+                fi
+
+
+                if ! ${SED} -i.bak -e '/imagePullSecrets/a \      - name: wso2creds' ../identity-server-deployment.yaml; then
+                    echoBold "Could not configure Kubernetes Docker image pull secret: Failed to create secret name"
+                    exit 1
+                fi;;
+        esac
     fi
 elif [[ ${REPLY} =~ ^[Nn]$ || -z "${REPLY}" ]]; then
      HAS_SUBSCRIPTION=1