Streamlined sample value file (#47)

znsio · Jan 14, 2025 · c53d41b · c53d41b
1 parent 0e67925
commit c53d41b
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 78 deletions.
diff --git a/...nopo11y-stack/samples/azure-nopo11y-stack-sample-values-with-private-docker-registry.yaml b/...nopo11y-stack/samples/azure-nopo11y-stack-sample-values-with-private-docker-registry.yaml
@@ -18,25 +18,19 @@ kube-prometheus-stack:
     image:
       registry: *imageRegistry
       repository: kube-state-metrics/kube-state-metrics
-      tag: ""
-      sha: ""
       pullPolicy: IfNotPresent
 
   prometheus-node-exporter:
     image:
       registry: *imageRegistry
       repository: prometheus/node-exporter
-      tag: ""
       pullPolicy: IfNotPresent
-      digest: ""
 
   prometheus:
     prometheusSpec:
       image:
         registry: *imageRegistry
         repository: prometheus/prometheus
-        tag: v2.51.2
-        sha: ""
       ruleSelectorNilUsesHelmValues: false
       serviceMonitorSelectorNilUsesHelmValues: false
       podMonitorSelectorNilUsesHelmValues: false
@@ -71,7 +65,6 @@ kube-prometheus-stack:
           cpu: 1500m
           memory: 4Gi
       thanos:
-        image: <CHANGE_THIS-Your Image Registry>/thanos/thanos:v0.35.0
         objectStorageConfig:
           existingSecret:
             name: nopo11y-stack-thanos-objstore-secret
@@ -181,8 +174,6 @@ kube-prometheus-stack:
       image:
         registry: *imageRegistry
         repository: prometheus/alertmanager
-        tag: v0.27.0
-        sha: ""
       externalUrl: "<CHANGE_THIS-Your External URL For Accessing Alertmanager>"
       routePrefix: /alertmanager
       resources:
@@ -205,29 +196,22 @@ kube-prometheus-stack:
     image:
       registry: *imageRegistry
       repository: grafana/grafana
-      tag: ""
-      sha: ""
       pullPolicy: IfNotPresent
     testFramework:
       enabled: true
       image:
         registry: *imageRegistry
         repository: bats/bats
-        tag: "v1.4.1"
       imagePullPolicy: IfNotPresent
     downloadDashboardsImage:
       registry: *imageRegistry
       repository: curlimages/curl
-      tag: 7.85.0
-      sha: ""
       pullPolicy: IfNotPresent
     initChownData:
       enabled: true
       image:
         registry: *imageRegistry
         repository: library/busybox
-        tag: "1.31.1"
-        sha: ""
         pullPolicy: IfNotPresent
     assertNoLeakedSecrets: false
     adminPassword: *grafanaAdminPassword
@@ -263,8 +247,6 @@ kube-prometheus-stack:
       image:
         registry: *imageRegistry
         repository: kiwigrid/k8s-sidecar
-        tag: 1.26.1
-        sha: ""
       imagePullPolicy: IfNotPresent
       resources:
         requests:
@@ -331,23 +313,17 @@ kube-prometheus-stack:
         image:
           registry: *imageRegistry
           repository: kube-webhook-certgen/amd64
-          tag: ""
-          sha: ""
           pullPolicy: IfNotPresent
       patch:
         enabled: true
         image:
           registry: *imageRegistry
           repository: ingress-nginx/kube-webhook-certgen
-          tag: v20221220-controller-v1.5.1-58-g787ea74b6
-          sha: ""
           pullPolicy: IfNotPresent 
     image:
       registry: *imageRegistry
       repository: prometheus-operator/prometheus-operator
       # if not set appVersion field from Chart.yaml is used
-      tag: ""
-      sha: ""
       pullPolicy: IfNotPresent
       resources:
         requests:
@@ -356,13 +332,16 @@ kube-prometheus-stack:
         limits:
           memory: 2Gi
 
+    thanosImage:
+      registry: devopsartifact.jio.com/docker-virtual-all
+      repository: thanos/thanos
+
   thanosRuler:
     enabled: true
     thanosRulerSpec:
       image:
         registry: *imageRegistry
         repository: thanos/thanos
-        tag: v0.34.1
       ruleSelector:
         matchExpressions:
           - key: managedby
@@ -404,10 +383,14 @@ kube-prometheus-stack:
 # Thanos
 thanos:
   enabled: true
+
+  global:
+    security:
+      allowInsecureImages: true
+
   image:
     registry: *imageRegistry
     repository: bitnami/thanos
-    tag: 0.34.1-debian-12-r3
     pullSecrets:
     - name: *imagePullSecretName
 
@@ -444,6 +427,8 @@ thanos:
       enabled: false
     stores:
     - dnssrv+_grpc._tcp.thanos-ruler-operated.observability.svc.cluster.local
+    pdb:
+      create: false
 
   queryFrontend:
     enabled: false
@@ -472,6 +457,8 @@ thanos:
       accessModes:
         - ReadWriteOnce
       size: 10Gi
+    pdb:
+      create: false
 
   storegateway:
     enabled: true
@@ -491,6 +478,8 @@ thanos:
       accessModes:
         - ReadWriteOnce
       size: 10Gi
+    pdb:
+      create: false
 
   metrics:
     enabled: true
@@ -1236,7 +1225,6 @@ sloth:
   enabled: true
   image:
     repository: <CHANGE_THIS-Your Image Registry>/slok/sloth
-    tag: v0.11.0
 
   resources:
     limits:
@@ -1260,7 +1248,6 @@ prom2teams:
   enabled: true
   image:
     repository: <CHANGE_THIS-Your Image Registry>/idealista/prom2teams
-    tag: null
     pullPolicy: IfNotPresent
   prom2teams:
       connector: *msTeamsWebHookConnector
@@ -1289,7 +1276,6 @@ kiali-server:
     image_pull_policy: IfNotPresent
     image_pull_secrets:
     - name: *imagePullSecretName
-    image_version: v2.1.0
     replicas: 1
     resources:
       requests:
@@ -1298,7 +1284,6 @@ kiali-server:
       limits:
         memory: "512Mi"
         cpu: "200m"
-    version_label: v1.83.0
 
   external_services:
     custom_dashboards:
@@ -1361,7 +1346,6 @@ kuberhealthy:
   image:
     registry: *imageRegistry
     repository: kuberhealthy/kuberhealthy
-    tag: ""
 
   check:
     daemonset:
@@ -1437,7 +1421,6 @@ kubernetes-event-exporter:
   image:
     registry: *imageRegistry
     repository: bitnami/kubernetes-event-exporter
-    tag: 1.7.0-debian-12-r10
 
   config:
     logLevel: warn

diff --git a/charts/nopo11y-stack/samples/azure-nopo11y-stack-sample-values.yaml b/charts/nopo11y-stack/samples/azure-nopo11y-stack-sample-values.yaml
@@ -317,6 +317,10 @@ kube-prometheus-stack:
 thanos:
   enabled: true
 
+  global:
+    security:
+      allowInsecureImages: true
+
   objstoreConfig:
     type: AZURE
     config:
@@ -350,6 +354,8 @@ thanos:
       enabled: false
     stores:
     - dnssrv+_grpc._tcp.thanos-ruler-operated.observability.svc.cluster.local
+    pdb:
+      create: false
 
   queryFrontend:
     enabled: false
@@ -378,6 +384,8 @@ thanos:
       accessModes:
         - ReadWriteOnce
       size: 10Gi
+    pdb:
+      create: false
 
   storegateway:
     enabled: true
@@ -397,6 +405,8 @@ thanos:
       accessModes:
         - ReadWriteOnce
       size: 10Gi
+    pdb:
+      create: false
 
   metrics:
     enabled: true
@@ -1173,7 +1183,6 @@ kiali-server:
       limits:
         memory: "512Mi"
         cpu: "200m"
-    version_label: v1.83.0
 
   external_services:
     custom_dashboards: