Merge pull request #37 from sloweyyy/dev

feat: Update deployment scripts and configurations for improved Grafana connection

Author: sloweyyy

DEPLOYMENT-UPDATES-SUMMARY.md

@@ -27,7 +27,7 @@ serviceAccount:
   name: ""
 
 podAnnotations:
-  sidecar.istio.io/inject: "false"
+  sidecar.istio.io/inject: "true"
 
 podSecurityContext: {}
   # fsGroup: 2000

Deployments/helm/basket/values.yaml

@@ -26,8 +26,8 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: 
-  sidecar.istio.io/inject: "false"
+podAnnotations:
+  sidecar.istio.io/inject: "true"
 
 podSecurityContext: {}
   # fsGroup: 2000

Deployments/helm/catalog/values.yaml

@@ -26,7 +26,7 @@ serviceAccount:
   name: ""
 
 podAnnotations:
-  sidecar.istio.io/inject: "false"
+  sidecar.istio.io/inject: "true"
 
 podSecurityContext: {}
   # fsGroup: 2000

Deployments/helm/discount/values.yaml

@@ -35,7 +35,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}

Deployments/helm/ocelotapigw/templates/deployment.yaml

@@ -24,7 +24,7 @@ serviceAccount:
   name: ""
 
 podAnnotations:
-  sidecar.istio.io/inject: "false"
+  sidecar.istio.io/inject: "true"
 
 podSecurityContext: {}
   # fsGroup: 2000

Deployments/helm/ocelotapigw/values.yaml

@@ -26,7 +26,7 @@ serviceAccount:
   name: ""
 
 podAnnotations:
-  sidecar.istio.io/inject: "false"
+  sidecar.istio.io/inject: "true"
 
 podSecurityContext: {}
   # fsGroup: 2000

Deployments/helm/ordering/values.yaml

@@ -35,6 +35,13 @@ spec:
             - name: http
               containerPort: 9000
               protocol: TCP
+          env:
+            {{- if .Values.env }}
+            {{- range .Values.env }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+            {{- end }}
+            {{- end }}
           volumeMounts:
             - name: portainer-data
               mountPath: /data

Deployments/helm/portainer/templates/deployment.yaml

@@ -41,3 +41,10 @@ persistence:
   storageClass: ""
   accessMode: ReadWriteOnce
   size: 1Gi
+
+# Environment variables for Portainer configuration
+env:
+  - name: PORTAINER_SESSION_TIMEOUT
+    value: "24h"
+  - name: PORTAINER_LOGO
+    value: "https://portainer.io/images/logos/portainer.png"