Merge pull request #29 from mathieu-benoit/onlineboutique-kustomize

`Kustomize` support for OnlineBoutique

Author: Mathieu Benoit

content/onlineboutique/deploy-onlineboutique.md

@@ -12,39 +12,71 @@ source ~/acm-workshop-variables.sh
 
 ## Get upstream Kubernetes manifests
 
-Create a dedicated folder for the Online Boutique sample apps in the GKE configs's Git repo:
+Get the upstream Kubernetes manifests:
 ```Bash
-cd ~/$ONLINE_BOUTIQUE_DIR_NAME/config-sync
-curl https://raw.githubusercontent.com/GoogleCloudPlatform/microservices-demo/main/release/kubernetes-manifests.yaml > tmp.yaml
-nomos hydrate --path . --output . --no-api-server-check --source-format unstructured
-rm tmp.yaml
+cd ~/$ONLINE_BOUTIQUE_DIR_NAME
+mkdir upstream
+mkdir upstream/base
+curl https://raw.githubusercontent.com/GoogleCloudPlatform/microservices-demo/main/release/kubernetes-manifests.yaml > upstream/base/kubernetes-manifests.yaml
+cd upstream/base
+kustomize create --resources kubernetes-manifests.yaml
 ```
 
-## Update Kubernetes manifests
+## Create base overlay
 
-Cleanup and update the upstream files:
+Create Kustomize base overlay files:
 ```Bash
-rm service_redis-cart.yaml
-rm deployment_redis-cart.yaml
-rm service_frontend-external.yaml
-kpt fn eval . \
-  -i set-namespace:v0.2 \
-  -- namespace=$ONLINEBOUTIQUE_NAMESPACE
-sed -i "s/redis-cart:6379/$REDIS_IP:$REDIS_PORT/g" ~/$ONLINE_BOUTIQUE_DIR_NAME/config-sync/deployment_cartservice.yaml
+mkdir ~/$ONLINE_BOUTIQUE_DIR_NAME/base
+cd ~/$ONLINE_BOUTIQUE_DIR_NAME/base
+kustomize create --resources ../upstream/base
+cat <<EOF >> ~/$ONLINE_BOUTIQUE_DIR_NAME/base/kustomization.yaml
+patchesJson6902:
+- target:
+    kind: Deployment
+    name: cartservice
+  patch: |-
+    - op: replace
+      path: /spec/template/spec/containers/0/env/0
+      value:
+        name: REDIS_ADDR
+        value: $REDIS_IP:$REDIS_PORT
+patchesStrategicMerge:
+- |-
+  apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: redis-cart
+  \$patch: delete
+- |-
+  apiVersion: v1
+  kind: Service
+  metadata:
+    name: redis-cart
+  \$patch: delete
+- |-
+  apiVersion: v1
+  kind: Service
+  metadata:
+    name: frontend-external
+  \$patch: delete
+EOF
 ```
+{{% notice note %}}
+Here we are removing the `redis-cart` `Deployment` and `Service` because we are leveraging Memorystore (redis) instead. We are also removing the default `frontend-external` `Service` because we will use the ASM Ingress Gateway to expose the Online Boutique's `frontend`.
+{{% /notice %}}
 
 ## Define VirtualService
 
+Define the `VirtualService` resource in order to establish the Ingress Gateway routing to the OnlineBoutique app:
 ```Bash
-cat <<EOF > ~/$ONLINE_BOUTIQUE_DIR_NAME/config-sync/virtualservice_frontend.yaml
+cat <<EOF > ~/$ONLINE_BOUTIQUE_DIR_NAME/base/virtual-service-frontend.yaml
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: frontend
-  namespace: ${ONLINEBOUTIQUE_NAMESPACE}
 spec:
   hosts:
-  - ${ONLINE_BOUTIQUE_INGRESS_GATEWAY_HOST_NAME}
+  - "*"
   gateways:
   - ${INGRESS_GATEWAY_NAMESPACE}/${INGRESS_GATEWAY_NAME}
   http:
@@ -56,6 +88,35 @@ spec:
 EOF
 ```
 
+Update the Kustomize base overlay:
+```Bash
+cd ~/$ONLINE_BOUTIQUE_DIR_NAME/base
+kustomize edit add resource virtual-service-frontend.yaml
+```
+
+## Define Staging namespace overlay
+
+```Bash
+cd ~/$ONLINE_BOUTIQUE_DIR_NAME/staging
+kustomize edit add resource ../base
+kustomize edit set namespace $ONLINEBOUTIQUE_NAMESPACE
+```
+
+Update the Kustomize base overlay in order to set proper `hosts` value in the `VirtualService` resource:
+```Bash
+cat <<EOF >> ~/$ONLINE_BOUTIQUE_DIR_NAME/staging/kustomization.yaml
+patchesJson6902:
+- target:
+    kind: VirtualService
+    name: frontend
+  patch: |-
+    - op: replace
+      path: /spec/hosts
+      value:
+        - ${ONLINE_BOUTIQUE_INGRESS_GATEWAY_HOST_NAME}
+EOF
+```
+
 ## Deploy Kubernetes manifests
 
 ```Bash