Merge branch 'add-replicas' of github.com:martinjt/opentelemetry-helm…

…-charts into add-replicas

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml

@@ -4,10 +4,10 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
   name: example-grafana-clusterrole
 rules: []

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml

@@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: example-grafana-clusterrolebinding
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-grafana
   namespace: default
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 data:
   grafana.ini: |

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-grafana
   namespace: default
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -26,32 +26,23 @@ spec:
         app.kubernetes.io/name: grafana
         app.kubernetes.io/instance: example
       annotations:
-        checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc
+        checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
         checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-        checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da
-        kubectl.kubernetes.io/default-container: grafana
+        checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4
     spec:
 
       serviceAccountName: example-grafana
       automountServiceAccountToken: true
       securityContext:
         fsGroup: 472
         runAsGroup: 472
-        runAsNonRoot: true
         runAsUser: 472
       enableServiceLinks: true
       containers:
         - name: grafana
-          image: "docker.io/grafana/grafana:10.0.3"
+          image: "grafana/grafana:9.4.7"
           imagePullPolicy: IfNotPresent
-          securityContext:
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop:
-              - ALL
-            seccompProfile:
-              type: RuntimeDefault
           volumeMounts:
             - name: config
               mountPath: "/etc/grafana/grafana.ini"

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml

@@ -6,9 +6,9 @@ metadata:
   name: example-grafana
   namespace: default
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 rules: []

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-grafana
   namespace: default
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-grafana
   namespace: default
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 type: Opaque
 data:

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml

@@ -6,10 +6,10 @@ metadata:
   name: example-grafana
   namespace: default
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml

@@ -4,10 +4,10 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
   name: example-grafana
   namespace: default

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml

@@ -9,10 +9,10 @@ metadata:
     "helm.sh/hook": test-success
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
 data:
   run.sh: |-

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml

@@ -4,10 +4,10 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
   name: example-grafana-test
   namespace: default

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml

@@ -5,10 +5,10 @@ kind: Pod
 metadata:
   name: example-grafana-test
   labels:
-    helm.sh/chart: grafana-6.58.8
+    helm.sh/chart: grafana-6.52.8
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "10.0.3"
+    app.kubernetes.io/version: "9.4.7"
     app.kubernetes.io/managed-by: Helm
   annotations:
     "helm.sh/hook": test-success
@@ -18,7 +18,7 @@ spec:
   serviceAccountName: example-grafana-test
   containers:
     - name: example-test
-      image: "docker.io/bats/bats:v1.4.1"
+      image: "bats/bats:v1.4.1"
       imagePullPolicy: "IfNotPresent"
       command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"]
       volumeMounts:

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml

@@ -5,10 +5,10 @@ kind: Service
 metadata:
   name: example-jaeger-agent
   labels:
-    helm.sh/chart: jaeger-0.71.11
+    helm.sh/chart: jaeger-0.69.1
     app.kubernetes.io/name: jaeger
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "1.45.0"
+    app.kubernetes.io/version: "1.42.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: service-agent
 spec:

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml

@@ -5,10 +5,10 @@ kind: Service
 metadata:
   name: example-jaeger-collector
   labels:
-    helm.sh/chart: jaeger-0.71.11
+    helm.sh/chart: jaeger-0.69.1
     app.kubernetes.io/name: jaeger
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "1.45.0"
+    app.kubernetes.io/version: "1.42.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: service-collector
 spec:

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml

@@ -5,10 +5,10 @@ kind: Deployment
 metadata:
   name: example-jaeger
   labels:
-    helm.sh/chart: jaeger-0.71.11
+    helm.sh/chart: jaeger-0.69.1
     app.kubernetes.io/name: jaeger
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "1.45.0"
+    app.kubernetes.io/version: "1.42.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: all-in-one
     prometheus.io/port: "14269"
@@ -44,7 +44,7 @@ spec:
               value: "false"
             - name: COLLECTOR_OTLP_ENABLED
               value: "true"
-          image: jaegertracing/all-in-one:1.45.0
+          image: jaegertracing/all-in-one:1.42.0
           imagePullPolicy: IfNotPresent
           name: jaeger
           args:
@@ -96,6 +96,4 @@ spec:
           resources:
             limits:
               memory: 300Mi
-          volumeMounts:
       serviceAccountName: example-jaeger
-      volumes:

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml

@@ -5,10 +5,10 @@ kind: Service
 metadata:
   name: example-jaeger-query
   labels:
-    helm.sh/chart: jaeger-0.71.11
+    helm.sh/chart: jaeger-0.69.1
     app.kubernetes.io/name: jaeger
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "1.45.0"
+    app.kubernetes.io/version: "1.42.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: service-query
 spec:

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml

@@ -5,9 +5,9 @@ kind: ServiceAccount
 metadata:
   name: example-jaeger
   labels:
-    helm.sh/chart: jaeger-0.71.11
+    helm.sh/chart: jaeger-0.69.1
     app.kubernetes.io/name: jaeger
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "1.45.0"
+    app.kubernetes.io/version: "1.42.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: all-in-one

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml

@@ -5,10 +5,10 @@ kind: ConfigMap
 metadata:
   name: example-otelcol-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.65.1
+    helm.sh/chart: opentelemetry-collector-0.57.2
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.82.0"
+    app.kubernetes.io/version: "0.77.0"
     app.kubernetes.io/managed-by: Helm
 data:
   relay: |

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml

@@ -5,10 +5,10 @@ kind: DaemonSet
 metadata:
   name: example-otelcol-agent
   labels:
-    helm.sh/chart: opentelemetry-collector-0.65.1
+    helm.sh/chart: opentelemetry-collector-0.57.2
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.82.0"
+    app.kubernetes.io/version: "0.77.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: e62fcdf5b3a33ec3cdb0ad02e110fcaa5f3ec9f29067a643b7413b0bd7623171
+        checksum/config: 19f2931042e627b07e3bf0e0b69778e9bcb40885393993fb6b7e8acebdc5c357
         opentelemetry_community_demo: "true"
         prometheus.io/port: "9464"
         prometheus.io/scrape: "true"
@@ -42,7 +42,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-contrib:0.82.0"
+          image: "otel/opentelemetry-collector-contrib:0.77.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: jaeger-compact

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml

@@ -5,8 +5,8 @@ kind: ServiceAccount
 metadata:
   name: example-otelcol
   labels:
-    helm.sh/chart: opentelemetry-collector-0.65.1
+    helm.sh/chart: opentelemetry-collector-0.57.2
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.82.0"
+    app.kubernetes.io/version: "0.77.0"
     app.kubernetes.io/managed-by: Helm

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml

@@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/instance: example
-    app.kubernetes.io/version: v2.46.0
-    helm.sh/chart: prometheus-23.3.0
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/part-of: prometheus
+    component: "server"
+    app: prometheus
+    release: example
+    chart: prometheus-20.2.0
+    heritage: Helm
   name: example-prometheus-server
 rules:
   - apiGroups:

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml

@@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/instance: example
-    app.kubernetes.io/version: v2.46.0
-    helm.sh/chart: prometheus-23.3.0
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/part-of: prometheus
+    component: "server"
+    app: prometheus
+    release: example
+    chart: prometheus-20.2.0
+    heritage: Helm
   name: example-prometheus-server
 subjects:
   - kind: ServiceAccount

charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml

@@ -4,13 +4,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/instance: example
-    app.kubernetes.io/version: v2.46.0
-    helm.sh/chart: prometheus-23.3.0
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/part-of: prometheus
+    component: "server"
+    app: prometheus
+    release: example
+    chart: prometheus-20.2.0
+    heritage: Helm
   name: example-prometheus-server
   namespace: default
 data: