Debugscriptfix test

.chloggen/update-operator.yaml

@@ -0,0 +1,12 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: operator
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Bump operator to 0.80.2 in helm-charts/splunk-otel-collector/Chart.yaml
+# One or more tracking issues related to the change
+issues: [1668]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/admission-webhooks/operator-webhook-with-cert-manager.yaml

@@ -6,12 +6,11 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/default-operator-serving-cert
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: webhook
   name: default-operator-mutation
 webhooks:
@@ -91,12 +90,11 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/default-operator-serving-cert
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: webhook
   name: default-operator-validation
 webhooks:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/certmanager.yaml

@@ -7,12 +7,11 @@ metadata:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-weight: "1"
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: webhook
   name: default-operator-serving-cert
   namespace: default
@@ -36,12 +35,11 @@ metadata:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-weight: "1"
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: webhook
   name: default-operator-selfsigned-issuer
   namespace: default

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/clusterrole.yaml

@@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-manager
 rules:
@@ -223,12 +222,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-metrics
 rules:
@@ -242,12 +240,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-proxy
 rules:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/clusterrolebinding.yaml

@@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-manager
 roleRef:
@@ -26,12 +25,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-proxy
 roleRef:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/deployment.yaml

@@ -4,12 +4,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator
   namespace: default
@@ -34,13 +33,13 @@ spec:
             - --enable-leader-election
             - --health-probe-addr=:8081
             - --webhook-port=9443
-            - --collector-image=quay.io/signalfx/splunk-otel-collector:0.110.0
+            - --collector-image=quay.io/signalfx/splunk-otel-collector:0.117.0
           command:
             - /manager
           env:
             - name: ENABLE_WEBHOOKS
               value: "true"
-          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.110.0"
+          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.117.0"
           name: manager
           ports:
             - containerPort: 8080
@@ -62,12 +61,7 @@ spec:
             initialDelaySeconds: 5
             periodSeconds: 10
           resources: 
-            limits:
-              cpu: 100m
-              memory: 128Mi
-            requests:
-              cpu: 100m
-              memory: 64Mi
+            {}
           volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert
@@ -83,13 +77,6 @@ spec:
             - containerPort: 8443
               name: https
               protocol: TCP
-          resources: 
-            limits:
-              cpu: 500m
-              memory: 128Mi
-            requests:
-              cpu: 5m
-              memory: 64Mi
       serviceAccountName: operator
       terminationGracePeriodSeconds: 10
       volumes:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml

@@ -42,10 +42,10 @@ spec:
       - name: OTEL_EXPORTER_OTLP_ENDPOINT
         value: http://default-splunk-otel-collector-agent.default.svc.cluster.local:4318
   go:
-    image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-go:v0.10.1-alpha
+    image: ghcr.io/open-telemetry/opentelemetry-go-instrumentation/autoinstrumentation-go:v0.19.0-alpha
     env:
       - name: OTEL_RESOURCE_ATTRIBUTES
-        value: splunk.zc.method=autoinstrumentation-go:v0.10.1-alpha
+        value: splunk.zc.method=autoinstrumentation-go:v0.19.0-alpha
   java:
     image: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v2.13.0
     env:

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/role.yaml

@@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-leader-election
   namespace: default

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/rolebinding.yaml

@@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-leader-election
   namespace: default

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/service.yaml

@@ -4,12 +4,11 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator
   namespace: default
@@ -32,12 +31,11 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   name: default-operator-webhook
   namespace: default

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/serviceaccount.yaml

@@ -6,10 +6,9 @@ metadata:
   name: operator
   namespace: default
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/tests/test-certmanager-connection.yaml

@@ -6,12 +6,11 @@ metadata:
   name: "default-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: webhook
   annotations:
     "helm.sh/hook": test

examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/tests/test-service-connection.yaml

@@ -6,12 +6,11 @@ metadata:
   name: "default-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   annotations:
     "helm.sh/hook": test
@@ -44,12 +43,11 @@ metadata:
   name: "default-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: operator-0.71.2
+    helm.sh/chart: operator-0.80.2
     app.kubernetes.io/name: operator
-    app.kubernetes.io/version: "0.110.0"
+    app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
-
     app.kubernetes.io/component: controller-manager
   annotations:
     "helm.sh/hook": test

helm-charts/splunk-otel-collector/Chart.yaml

@@ -32,7 +32,7 @@ dependencies:
     alias: operatorcrds
     condition: operatorcrds.install
   - name: opentelemetry-operator
-    version: 0.71.2
+    version: 0.80.2
     alias: operator
     repository: https://open-telemetry.github.io/opentelemetry-helm-charts
     condition: operator.enabled

helm-charts/splunk-otel-collector/values.yaml

@@ -1283,8 +1283,8 @@ instrumentation:
       - name: OTEL_DOTNET_AUTO_PLUGINS
         value: Splunk.OpenTelemetry.AutoInstrumentation.Plugin,Splunk.OpenTelemetry.AutoInstrumentation
   go:
-    repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-go
-    tag: v0.10.1-alpha
+    repository: ghcr.io/open-telemetry/opentelemetry-go-instrumentation/autoinstrumentation-go
+    tag: v0.19.0-alpha
     # env:
     #   - name: GO_ENV_VAR
     #     value: go_value

tools/splunk_kubernetes_debug_info.sh

@@ -35,6 +35,10 @@
 # - Cert-manager related objects
 # - MutatingWebhookConfiguration objects
 
+# Include the base utility functions for setting and debugging variables
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "$SCRIPT_DIR/../ci_scripts/base_util.sh"
+
 # Helper function to write output to a file
 write_output() {
   local output="$1"
@@ -57,7 +61,7 @@ write_output() {
   fi
 
   # Redact sensitive information from output
-  redact_sensitive_info "$output" "$file_name"
+  redact_sensitive_info "$output" > "$file_name"
 }
 
 # Function to collect data for a given namespace