Makefile support to deploy sample Istio with ambient profile (openshift-service-mesh#546)

* Makefile support to deploy sample Istio with ambient profile

Updated makefile commands:

Deployment
  deploy-istio               Deploy a sample Istio resource (without CNI) to an existing cluster.
  deploy-istio-with-cni      Deploy a sample Istio and IstioCNI resource to an existing cluster.
  deploy-istio-with-ambient  Deploy necessary Istio resources using the ambient profile.

Fixes: istio-ecosystem#545
Signed-off-by: Sridhar Gaddam <[email protected]>

* Rename istio-sample-openshift.yaml to istio-sample.yaml

Signed-off-by: Sridhar Gaddam <[email protected]>

---------

Signed-off-by: Sridhar Gaddam <[email protected]>

Author: sridhargaddam

Makefile.core.mk

@@ -343,20 +343,26 @@ undeploy-olm: verify-kubeconfig operator-sdk ## Undeploy the operator from an ex
 	kubectl delete ztunnel.sailoperator.io --all --all-namespaces --wait=true
 	$(OPERATOR_SDK) cleanup $(OPERATOR_NAME) --delete-all -n ${NAMESPACE}
 
-.PHONY: deploy-example
-deploy-example: deploy-example-openshift ## Deploy an example Istio resource to an existing OCP cluster. Same as `deploy-example-openshift`.
+.PHONY: deploy-istio
+deploy-istio: verify-kubeconfig ## Deploy a sample Istio resource (without CNI) to an existing cluster.
+	kubectl create ns istio-system || echo "namespace istio-system already exists"
+	kubectl apply -f chart/samples/istio-sample.yaml
 
-.PHONY: deploy-example-openshift
-deploy-example-openshift: verify-kubeconfig ## Deploy an example Istio and IstioCNI resource to an existing OCP cluster.
+.PHONY: deploy-istio-with-cni
+deploy-istio-with-cni: verify-kubeconfig ## Deploy a sample Istio and IstioCNI resource to an existing cluster.
 	kubectl create ns istio-cni || echo "namespace istio-cni already exists"
 	kubectl apply -f chart/samples/istiocni-sample.yaml
 	kubectl create ns istio-system || echo "namespace istio-system already exists"
-	kubectl apply -f chart/samples/istio-sample-openshift.yaml
+	kubectl apply -f chart/samples/istio-sample.yaml
 
-.PHONY: deploy-example-kubernetes
-deploy-example-kubernetes: verify-kubeconfig ## Deploy an example Istio resource on an existing cluster.
+.PHONY: deploy-istio-with-ambient
+deploy-istio-with-ambient: verify-kubeconfig ## Deploy necessary Istio resources using the ambient profile.
 	kubectl create ns istio-system || echo "namespace istio-system already exists"
-	kubectl apply -f chart/samples/istio-sample-kubernetes.yaml
+	kubectl apply -f chart/samples/ambient/istio-sample.yaml
+	kubectl create ns istio-cni || echo "namespace istio-cni already exists"
+	kubectl apply -f chart/samples/ambient/istiocni-sample.yaml
+	kubectl create ns ztunnel || echo "namespace zunnel already exists"
+	kubectl apply -f chart/samples/ambient/istioztunnel-sample.yaml
 
 ##@ Generated Code & Resources
 

README.md

@@ -99,20 +99,10 @@ Make sure that the `HUB` and `TAG` environment variables point to your container
 
 Create an instance of the `Istio` resource to install the Istio Control Plane.
 
-Use the `istio-sample-kubernetes.yaml` file on vanilla Kubernetes:
-
-```sh
-# Create the istio-system namespace if it does not exist
-kubectl create ns istio-system
-kubectl apply -f chart/samples/istio-sample-kubernetes.yaml
-```
-
-Use the `istio-sample-openshift.yaml` file on OpenShift:
-
 ```sh
 # Create the istio-system namespace if it does not exist
 kubectl create ns istio-system
-kubectl apply -f chart/samples/istio-sample-openshift.yaml
+kubectl apply -f chart/samples/istio-sample.yaml
 ```
 
 On OpenShift, you must also deploy the Istio CNI plugin by creating an instance of the `IstioCNI` resource:

chart/README.md

@@ -124,13 +124,13 @@ The `sail-operator` charts directory contains `samples` directory, which contain
 * Kubernetes
 
     ```sh
-    $ kubectl apply -f sail-operator/samples/istio-sample-kubernetes.yaml
+    $ kubectl apply -f sail-operator/samples/istio-sample.yaml
     ```
 
 * OpenShift
 
     ```sh
-    $ kubectl apply -f sail-operator/samples/istio-sample-openshift.yaml
+    $ kubectl apply -f sail-operator/samples/istio-sample.yaml
     $ kubectl apply -f sail-operator/samples/istiocni-sample.yaml
     ```
 

chart/samples/istio-sample-kubernetes.yaml

@@ -1,9 +1,5 @@
-{{ if and .Values.bundleGeneration (eq .Values.platform "openshift") }}
-{{ .Files.Get "samples/istio-sample-openshift.yaml" }}
----
-{{ .Files.Get "samples/istiocni-sample.yaml" }}
-{{ else if .Values.bundleGeneration }}
-{{ .Files.Get "samples/istio-sample-kubernetes.yaml" }}
+{{ if .Values.bundleGeneration }}
+{{ .Files.Get "samples/istio-sample.yaml" }}
 ---
 {{ .Files.Get "samples/istiocni-sample.yaml" }}
 {{ end }}

chart/samples/istio-sample-openshift.yaml chart/samples/istio-sample.yamlchart/samples/istio-sample-openshift.yaml renamed to chart/samples/istio-sample.yaml

@@ -88,7 +88,7 @@ function updateVersionInSamples() {
 
     sed -i -E \
       -e "s/version: .*/version: $defaultVersion/g" \
-      chart/samples/istio-sample-kubernetes.yaml chart/samples/istio-sample-openshift.yaml chart/samples/istiocni-sample.yaml
+      chart/samples/istio-sample.yaml chart/samples/istiocni-sample.yaml
 }
 
 updateVersionsInIstioTypeComment

chart/templates/olm/samples.yaml

@@ -121,19 +121,14 @@ initialize_variables() {
   LOCALBIN="${LOCALBIN:-${HOME}/bin}"
   OPERATOR_SDK=${LOCALBIN}/operator-sdk
   IP_FAMILY=${IP_FAMILY:-ipv4}
+  ISTIO_MANIFEST="chart/samples/istio-sample.yaml"
 
   if [ "${OCP}" == "true" ]; then
     COMMAND="oc"
   fi
 
   echo "Using command: ${COMMAND}"
 
-  if [ "${OCP}" == "true" ]; then
-    ISTIO_MANIFEST="chart/samples/istio-sample-openshift.yaml"
-  else
-    ISTIO_MANIFEST="chart/samples/istio-sample-kubernetes.yaml"
-  fi
-
   echo "Setting Istio manifest file: ${ISTIO_MANIFEST}"
   ISTIO_NAME=$(yq eval '.metadata.name' "${WD}/../../$ISTIO_MANIFEST")