Merge branch 'main' into ccp_shell_removal_branch

Azure · Jan 4, 2024 · 133e148 · 133e148
2 parents 4c80e36 + cdd6a16
commit 133e148
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 42,338 deletions.
diff --git a/.pipelines/azure-pipeline-build.yml b/.pipelines/azure-pipeline-build.yml
@@ -252,10 +252,10 @@ jobs:
 #     - task: CodeQL3000Init@0
 #       displayName: 'SDL: init codeql'
 
-#     - task: GoTool@0
-#       displayName: "Build: specify golang version"
-#       inputs:
-#         version: '1.20'
+    # - task: GoTool@0
+    #   displayName: "Build: specify golang version"
+    #   inputs:
+    #     version: '1.21.5'
 
 #     - bash: |
 #         sudo apt-get install build-essential -y

diff --git a/otelcollector/otel-allocator/prometheus-operator/bundle.yaml b/otelcollector/otel-allocator/prometheus-operator/bundle.yaml
diff --git a/otelcollector/otel-allocator/prometheus-operator/example/admission-webhook/deployment.yaml b/otelcollector/otel-allocator/prometheus-operator/example/admission-webhook/deployment.yaml
diff --git a/otelcollector/otel-allocator/prometheus-operator/example/non-rbac/prometheus-operator.yaml b/otelcollector/otel-allocator/prometheus-operator/example/non-rbac/prometheus-operator.yaml
diff --git a/.../prometheus-operator/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/.../prometheus-operator/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
diff --git a/otelcollector/otel-allocator/prometheus-operator/example/shards/example-app-deployment.yaml b/otelcollector/otel-allocator/prometheus-operator/example/shards/example-app-deployment.yaml
diff --git a/otelcollector/otel-allocator/prometheus-operator/example/thanos/query-deployment.yaml b/otelcollector/otel-allocator/prometheus-operator/example/thanos/query-deployment.yaml
diff --git a/...cator/prometheus-operator/example/user-guides/getting-started/example-app-deployment.yaml b/...cator/prometheus-operator/example/user-guides/getting-started/example-app-deployment.yaml
diff --git a/...tel-allocator/prometheus-operator/test/framework/resources/basic-auth-app-deployment.yaml b/...tel-allocator/prometheus-operator/test/framework/resources/basic-auth-app-deployment.yaml