Merge branch 'main' into dependabot/go_modules/otelcollector/fluent-b…

…it/src/k8s.io/client-go-0.29.0
Azure · Jan 18, 2024 · 0cb36c1 · 0cb36c1
2 parents f2c2e33 + fc9c939
commit 0cb36c1
Show file tree

Hide file tree

Showing 519 changed files with 33,480 additions and 55,645 deletions.
diff --git a/.pipelines/azure-pipeline-build.yml b/.pipelines/azure-pipeline-build.yml
@@ -66,7 +66,7 @@ jobs:
 
 
         #Truncating this to 112 characters to add the targetallocator suffix
-        TARGET_ALLOCATOR_IMAGE_TAG_PREFIX=$(echo "${LINUX_IMAGE_TAG}" | cut -c1-124)
+        TARGET_ALLOCATOR_IMAGE_TAG_PREFIX=$(echo "${LINUX_IMAGE_TAG}" | cut -c1-112)
         TARGET_ALLOCATOR_IMAGE_TAG=$TARGET_ALLOCATOR_IMAGE_TAG_PREFIX-targetallocator
 
         #Truncating this to 113 to add the ref app suffices
@@ -164,6 +164,7 @@ jobs:
     name: Azure-Pipelines-CI-Test-EO
   dependsOn: Image_Tags_and_Ev2_Artifacts
   variables:
+    skipComponentGovernanceDetection: true
     LINUX_REF_APP_GOLANG_FULL_IMAGE_NAME: $[ dependencies.Image_Tags_and_Ev2_Artifacts.outputs['setup.LINUX_REF_APP_GOLANG_FULL_IMAGE_NAME'] ]
   # This is necessary because of: https://github.com/moby/moby/issues/37965
     DOCKER_BUILDKIT: 1
@@ -188,6 +189,7 @@ jobs:
     name: Azure-Pipelines-CI-Test-EO
   dependsOn: Image_Tags_and_Ev2_Artifacts
   variables:
+    skipComponentGovernanceDetection: true
     LINUX_REF_APP_PYTHON_FULL_IMAGE_NAME: $[ dependencies.Image_Tags_and_Ev2_Artifacts.outputs['setup.LINUX_REF_APP_PYTHON_FULL_IMAGE_NAME'] ]
   # This is necessary because of: https://github.com/moby/moby/issues/37965
     DOCKER_BUILDKIT: 1
@@ -244,6 +246,8 @@ jobs:
   displayName: "SDL: linux binary scanning"
   pool:
     name: Azure-Pipelines-CI-Test-EO
+  variables:
+    skipComponentGovernanceDetection: true
   steps:
     - checkout: self
       submodules: true
@@ -254,25 +258,28 @@ jobs:
     - task: GoTool@0
       displayName: "Build: specify golang version"
       inputs:
-        version: '1.20'
+        version: '1.21.5'
 
     - bash: |
         sudo apt-get install build-essential -y
         make
       workingDirectory: $(Build.SourcesDirectory)/otelcollector/opentelemetry-collector-builder/
       displayName: "SDL: build otelcollector, promconfigvalidator, targetallocator, and fluent-bit plugin for scanning"
+      retryCountOnTaskFailure: 1
 
     - task: BinSkim@4
       displayName: 'SDL: run binskim'
       inputs:
         InputType: 'CommandLine'
         arguments: 'analyze --rich-return-code $(Build.SourcesDirectory)/otelcollector/opentelemetry-collector-builder/otelcollector $(Build.SourcesDirectory)/otelcollector/prom-config-validator-builder/promconfigvalidator $(Build.SourcesDirectory)/otelcollector/otel-allocator/targetallocator $(Build.SourcesDirectory)/otelcollector/fluent-bit/src/out_appinsights.so'
+      retryCountOnTaskFailure: 1
 
     - task: Gosec@1
       displayName: 'SDL: run gosec'
       inputs:
         targetPattern: 'gosecPattern'
         targetGosecPattern: '$(Build.SourcesDirectory)/otelcollector'
+      retryCountOnTaskFailure: 1
 
     - bash: |
         wget https://github.com/microsoft/DevSkim/releases/download/v0.6.9/DevSkim_linux_0.6.9.zip
@@ -281,12 +288,13 @@ jobs:
         ./DevSkim_linux_0.6.9/devskim analyze $(Build.SourcesDirectory)/otelcollector --ignore-globs **/deploy/dashboard/**,**/react/static/** --severity critical,important
       displayName: 'SDL: run devskim'
       workingDirectory: $(Build.SourcesDirectory)
+      retryCountOnTaskFailure: 1
 
     - bash: |
         sudo gem install brakeman -v 5.4.1
         brakeman $(Build.SourcesDirectory)/otelcollector/configmapparser --force
       displayName: 'SDL: run brakeman'
-
+      retryCountOnTaskFailure: 1
 
 - job: Linux_Prometheus_Collector
   displayName: "Build: linux prometheus-collector image"
@@ -1030,11 +1038,6 @@ jobs:
     displayName: "Check images are pushed to dev MCR"
     retryCountOnTaskFailure: 5
 
-  - bash: |
-      helm pull oci://$(MCR_REGISTRY)$(MCR_REPOSITORY_HELM) --version $(HELM_SEMVER)
-    workingDirectory: $(Build.StagingDirectory)
-    displayName: "Pull helm chart from dev MCR"
-
   - bash: |
       export AKS_REGION="eastus"
       export AKS_RESOURCE_ID="/subscriptions/9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb/resourceGroups/ci-dev-aks-mac-eus-rg/providers/Microsoft.ContainerService/managedClusters/ci-dev-aks-mac-eus"

diff --git a/.pipelines/deployment/ServiceGroupRoot/RolloutSpecs/RolloutSpecs.json b/.pipelines/deployment/ServiceGroupRoot/RolloutSpecs/RolloutSpecs.json
@@ -22,50 +22,69 @@
       "name": "PushLinuxAgent",
       "targetType": "ServiceResource",
       "targetName": "PushLinuxAgent",
-      "actions": [ "Shell/PushAgentToACR" ],
-      "dependsOn": [ ]
+      "actions": [
+        "Shell/PushAgentToACR"
+      ],
+      "dependsOn": []
     },
     {
       "name": "PushWindowsAgent",
       "targetType": "ServiceResource",
       "targetName": "PushWindowsAgent",
-      "actions": [ "Shell/PushAgentToACR" ],
-      "dependsOn": [ ]
+      "actions": [
+        "Shell/PushAgentToACR"
+      ],
+      "dependsOn": []
     },
     {
       "name": "PushTargetAllocator",
       "targetType": "ServiceResource",
       "targetName": "PushTargetAllocator",
-      "actions": [ "Shell/PushAgentToACR" ],
-      "dependsOn": [ ]
+      "actions": [
+        "Shell/PushAgentToACR"
+      ],
+      "dependsOn": []
     },
     {
       "name": "PushConfigReader",
       "targetType": "ServiceResource",
       "targetName": "PushConfigReader",
-      "actions": [ "Shell/PushAgentToACR" ],
-      "dependsOn": [ ]
+      "actions": [
+        "Shell/PushAgentToACR"
+      ],
+      "dependsOn": []
     },
     {
       "name": "PushKSMChart",
       "targetType": "ServiceResource",
       "targetName": "PushKSMChart",
-      "actions": [ "Shell/PushAgentToACR" ],
-      "dependsOn": [ ]
+      "actions": [
+        "Shell/PushAgentToACR"
+      ],
+      "dependsOn": []
     },
     {
       "name": "PushNEChart",
       "targetType": "ServiceResource",
       "targetName": "PushNEChart",
-      "actions": [ "Shell/PushAgentToACR" ],
-      "dependsOn": [ ]
+      "actions": [
+        "Shell/PushAgentToACR"
+      ],
+      "dependsOn": []
     },
     {
       "name": "PushARCHelmChart",
       "targetType": "ServiceResource",
       "targetName": "PushARCHelmChart",
-      "actions": [ "Shell/PushAgentToACR" ],
-      "dependsOn": [ "PushLinuxAgent", "PushWindowsAgent", "PushKSMChart", "PushNEChart" ]
+      "actions": [
+        "Shell/PushAgentToACR"
+      ],
+      "dependsOn": [
+        "PushLinuxAgent",
+        "PushWindowsAgent",
+        "PushKSMChart",
+        "PushNEChart"
+      ]
     }
   ]
 }