Revert "Bump otelcontribcol version to v0.106.0-gke.2 (GoogleContainerTools#1369)" (GoogleContainerTools#1376)

This reverts commit 91e1b14.

Reason for revert: This change breaks TestOtelCollectorDeployment

Author: sdowell

Makefile

@@ -84,7 +84,7 @@ HELM_STAGING_DIR := $(OUTPUT_DIR)/third_party/helm
 GIT_SYNC_VERSION := v4.2.3-gke.5__linux_amd64
 GIT_SYNC_IMAGE_NAME := gcr.io/config-management-release/git-sync:$(GIT_SYNC_VERSION)
 
-OTELCONTRIBCOL_VERSION := v0.106.0-gke.2
+OTELCONTRIBCOL_VERSION := v0.102.0-gke.6
 OTELCONTRIBCOL_IMAGE_NAME := gcr.io/config-management-release/otelcontribcol:$(OTELCONTRIBCOL_VERSION)
 
 # Directory used for staging Docker contexts.

manifests/base/kustomization.yaml

@@ -22,7 +22,6 @@ resources:
 - ../ns-reconciler-base-cluster-role.yaml
 - ../root-reconciler-base-cluster-role.yaml
 - ../otel-agent-cm.yaml
-- ../otel-agent-reconciler-cm.yaml
 - ../reconciler-manager-service-account.yaml
 - ../reposync-crd.yaml
 - ../rootsync-crd.yaml

manifests/otel-agent-cm.yaml

@@ -32,6 +32,24 @@ data:
         tls:
           insecure: true
     processors:
+      # Attributes processor adds custom configsync metric labels to applicable
+      # metrics to identify the sync object used to configure this deployment.
+      #
+      # Note: configsync.sync.generation is explicitly excluded here, because it
+      # is high cardinality. So we don't want to send it as a label, only as a
+      # resource attribute. That way it's only propagated to Prometheus, and not
+      # Monarch or Cloud Monitoring, which ignore custom resource attributes.
+      attributes:
+        actions:
+          - key: configsync.sync.kind
+            action: upsert
+            value: $CONFIGSYNC_SYNC_KIND
+          - key: configsync.sync.name
+            action: upsert
+            value: $CONFIGSYNC_SYNC_NAME
+          - key: configsync.sync.namespace
+            action: upsert
+            value: $CONFIGSYNC_SYNC_NAMESPACE
       batch:
       # Populate resource attributes from OTEL_RESOURCE_ATTRIBUTES env var and
       # the GCE metadata service, if available.
@@ -44,7 +62,7 @@ data:
       pipelines:
         metrics:
           receivers: [opencensus]
-          processors: [batch, resourcedetection]
+          processors: [batch, resourcedetection, attributes]
           exporters: [opencensus]
       telemetry:
         logs:

manifests/otel-agent-reconciler-cm.yaml

@@ -101,7 +101,6 @@ spec:
         # The prometheus transformer appends `_ratio` to gauge metrics: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.86.0/pkg/translator/prometheus/normalize_name.go#L149
         # Add the feature gate to enable metric suffix trimming.
         - "--feature-gates=-pkg.translator.prometheus.NormalizeName"
-        - "--feature-gates=-component.UseLocalHostAsDefaultHost"
         resources:
           limits:
             cpu: 1

manifests/templates/otel-collector.yaml

@@ -168,11 +168,10 @@ data:
            command:
            - /otelcontribcol
            args:
-           - "--config=/conf/otel-agent-reconciler-config.yaml"
+           - "--config=/conf/otel-agent-config.yaml"
            # The prometheus transformer appends `_ratio` to gauge metrics: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.86.0/pkg/translator/prometheus/normalize_name.go#L149
            # Add the feature gate to enable metric suffix trimming.
            - "--feature-gates=-pkg.translator.prometheus.NormalizeName"
-           - "--feature-gates=-component.UseLocalHostAsDefaultHost"
            securityContext:
              allowPrivilegeEscalation: false
              readOnlyRootFilesystem: true
@@ -185,7 +184,7 @@ data:
            - containerPort: 8888  # Metrics.
              protocol: TCP
            volumeMounts:
-           - name: otel-agent-config-reconciler-vol
+           - name: otel-agent-config-vol
              mountPath: /conf
            readinessProbe:
              httpGet:
@@ -274,9 +273,9 @@ data:
            secret:
              secretName: git-creds
              defaultMode: 288
-         - name: otel-agent-config-reconciler-vol
+         - name: otel-agent-config-vol
            configMap:
-             name: otel-agent-reconciler
+             name: otel-agent
              defaultMode: 420
          - name: service-account
            emptyDir: {}

manifests/templates/reconciler-manager-configmap.yaml

@@ -71,7 +71,6 @@ spec:
         # The prometheus transformer appends `_ratio` to gauge metrics: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.86.0/pkg/translator/prometheus/normalize_name.go#L149
         # Add the feature gate to enable metric suffix trimming.
         - "--feature-gates=-pkg.translator.prometheus.NormalizeName"
-        - "--feature-gates=-component.UseLocalHostAsDefaultHost"
         resources:
           limits:
             cpu: 1

manifests/templates/reconciler-manager.yaml

@@ -231,7 +231,6 @@ spec:
             - ALL
       - args:
         - --config=/conf/otel-agent-config.yaml
-        - --feature-gates=-component.UseLocalHostAsDefaultHost
         command:
         - /otelcontribcol
         env: