sidecar deployment

istio-manifests/frontend-gateway.yaml

@@ -12,21 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: networking.istio.io/v1alpha3
+# apiVersion: networking.istio.io/v1alpha3
-kind: Gateway
+# kind: Gateway
-metadata:
+# metadata:
-  name: frontend-gateway
+#   name: frontend-gateway
-spec:
+# spec:
-  selector:
+#   selector:
-    istio: ingressgateway # use Istio default gateway implementation
+#     istio: ingressgateway # use Istio default gateway implementation
-  servers:
+#   servers:
-  - port:
+#   - port:
-      number: 80
+#       number: 80
-      name: http
+#       name: http
-      protocol: HTTP
+#       protocol: HTTP
-    hosts:
+#     hosts:
-    - "*"
+#     - "*"
----
+# ---
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
@@ -35,7 +35,7 @@ spec:
   hosts:
   - "*"
   gateways:
-  - frontend-gateway
+  - ingressgateway.istio-system
   http:
   - route:
     - destination:

istio-manifests/istio-demo.yaml

@@ -18376,12 +18376,27 @@ spec:
     spec:
       serviceAccountName: prometheus
       containers:
+        - name: sidecar
+          image: gcr.io/stackdriver-prometheus/stackdriver-prometheus-sidecar:0.7.3
+          args:
+          - "--stackdriver.project-id=tonyh-gke-o11y-anz-openbanking"
+          - "--prometheus.wal-directory=/data/wal"
+          - "--prometheus.api-address=http://127.0.0.1:9090"
+          - "--stackdriver.kubernetes.location=australia-southeast1"
+          - "--stackdriver.kubernetes.cluster-name=o11y-ob"
+          ports:
+          - name: sidecar
+            containerPort: 9091
+          volumeMounts:
+          - name: data-volume
+            mountPath: /data
         - name: prometheus
           image: "docker.io/prom/prometheus:v2.12.0"
           imagePullPolicy: IfNotPresent
           args:
             - '--storage.tsdb.retention=6h'
             - '--config.file=/etc/prometheus/prometheus.yml'
+            - '--storage.tsdb.path=/data'
           ports:
             - containerPort: 9090
               name: http
@@ -18398,11 +18413,15 @@ spec:
               cpu: 10m
 
           volumeMounts:
+          - name: data-volume
+            mountPath: /data
           - name: config-volume
             mountPath: /etc/prometheus
           - mountPath: /etc/istio-certs
             name: istio-certs
       volumes:
+      - name: data-volume
+        emptyDir: {}
       - name: config-volume
         configMap:
           name: prometheus

kubernetes-manifests-tracing/adservice.yaml

@@ -39,7 +39,7 @@ spec:
         # - name: DISABLE_TRACING
         #   value: "1"
         - name: JAEGER_SERVICE_ADDR
-          value: "jaeger-collector:14268"
+          value: "jaeger-collector.istio-sysem.svc:14268"
         resources:
           requests:
             cpu: 200m

kubernetes-manifests-tracing/checkoutservice.yaml

@@ -58,7 +58,7 @@ spec:
           # - name: DISABLE_PROFILER
           #   value: "1"
           - name: JAEGER_SERVICE_ADDR
-            value: "jaeger-collector:14268"
+            value: "jaeger-collector.istio-sysem.svc:14268"
           resources:
             requests:
               cpu: 100m

kubernetes-manifests-tracing/frontend.yaml

@@ -70,7 +70,7 @@ spec:
           # - name: DISABLE_PROFILER
           #   value: "1"
           - name: JAEGER_SERVICE_ADDR
-            value: "jaeger-collector:14268"
+            value: "jaeger-collector.istio-sysem.svc:14268"
           resources:
             requests:
               cpu: 100m

kubernetes-manifests-tracing/productcatalogservice.yaml

@@ -41,7 +41,7 @@ spec:
         # - name: DISABLE_PROFILER
         #   value: "1"
         - name: JAEGER_SERVICE_ADDR
-          value: "jaeger-collector:14268"
+          value: "jaeger-collector.istio-sysem.svc:14268"
         readinessProbe:
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:3550"]

kubernetes-manifests-tracing/shippingservice.yaml

@@ -40,7 +40,7 @@ spec:
         - name: DISABLE_PROFILER
           value: "1"
         - name: JAEGER_SERVICE_ADDR
-          value: "jaeger-collector:14268"
+          value: "jaeger-collector.istio-sysem.svc:14268"
         readinessProbe:
           periodSeconds: 5
           exec:

kubernetes-manifests/frontend.yaml

@@ -91,16 +91,16 @@ spec:
   - name: http
     port: 80
     targetPort: 8080
----
+# ---
-apiVersion: v1
+# apiVersion: v1
-kind: Service
+# kind: Service
-metadata:
+# metadata:
-  name: frontend-external
+#   name: frontend-external
-spec:
+# spec:
-  type: LoadBalancer
+#   type: LoadBalancer
-  selector:
+#   selector:
-    app: frontend
+#     app: frontend
-  ports:
+#   ports:
-  - name: http
+#   - name: http
-    port: 80
+#     port: 80
-    targetPort: 8080
+#     targetPort: 8080

patch.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+KUBE_NAMESPACE=istio-system
+KUBE_CLUSTER=o11y-ob
+GCP_REGION=australia-southeast1
+GCP_PROJECT=tonyh-gke-o11y-anz-openbanking
+DATA_DIR=/data
+DATA_VOLUME=data-volume
+SIDECAR_IMAGE_TAG=0.7.3
+set -e
+set -u
+
+usage() {
+  echo -e "Usage: $0 <deployment|statefulset> <name>\n"
+}
+
+if [  $# -le 1 ]; then
+  usage
+  exit 1
+fi
+
+# Override to use a different Docker image name for the sidecar.
+export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-prometheus/stackdriver-prometheus-sidecar'}
+
+kubectl -n "${KUBE_NAMESPACE}" patch "$1" "$2" --type strategic --patch "
+spec:
+  template:
+    spec:
+      containers:
+      - name: sidecar
+        image: ${SIDECAR_IMAGE_NAME}:${SIDECAR_IMAGE_TAG}
+        imagePullPolicy: Always
+        args:
+        - \"--stackdriver.project-id=${GCP_PROJECT}\"
+        - \"--prometheus.wal-directory=${DATA_DIR}/wal\"
+        - \"--stackdriver.kubernetes.location=${GCP_REGION}\"
+        - \"--stackdriver.kubernetes.cluster-name=${KUBE_CLUSTER}\"
+        #- \"--stackdriver.generic.location=${GCP_REGION}\"
+        #- \"--stackdriver.generic.namespace=${KUBE_CLUSTER}\"
+        ports:
+        - name: sidecar
+          containerPort: 9091
+        volumeMounts:
+        - name: ${DATA_VOLUME}
+          mountPath: ${DATA_DIR}
+"

skaffold.yaml

@@ -85,5 +85,4 @@ profiles:
   deploy:
     kubectl:
       manifests:
-      - ./kubernetes-manifests/**.yaml
+      - ./kubernetes-manifests-tracing/**.yaml
-      - ./istio-manifests/**.yaml