build multi-arch images

.pipelines/azure_pipeline_dev.yaml

@@ -0,0 +1,100 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- ci_dev
+
+pool:
+  name: Azure-Pipelines-CI-Test-EO
+
+variables:
+  armServiceConnectionName: 'ci-1es-acr-connection'
+  subscription: '9b96ebbd-c57a-42d1-bbe9-b69296e4c7fb'
+  containerRegistry: 'containerinsightsprod'
+  repoImageName: '${{ variables.containerRegistry }}.azurecr.io/public/azuremonitor/containerinsights/cidev'
+
+steps:
+- bash: |
+    commit=$(git rev-parse --short HEAD)
+    echo "##vso[task.setvariable variable=commit;]$commit"
+
+    datetime=$(date +'%Y%m%d%s')
+    echo "##vso[task.setvariable variable=datetime;]$datetime"
+
+    cd deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts
+    tar -czvf ../artifacts.tar.gz pushAgentToAcr.sh
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment artifacts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/deployment"
+    Contents: |
+      **/*
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/.pipelines"
+    Contents: |
+      *.sh
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/kubernetes"
+    Contents: |
+      *.yaml
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/charts"
+    Contents: |
+      **/*
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/test/e2e"
+    Contents: |
+      *.yaml
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: AzureCLI@2
+  inputs:
+    azureSubscription: ${{ variables.armServiceConnectionName }}
+    scriptType: bash
+    scriptLocation: inlineScript
+    inlineScript: |
+
+      sudo apt-get update && sudo apt-get -y install qemu binfmt-support qemu-user-static
+      docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
+      docker buildx create --name testbuilder
+      docker buildx use testbuilder
+
+      az --version
+      az account show
+      az account set -s ${{ variables.subscription }}
+      az acr login -n ${{ variables.containerRegistry }}
+
+      docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ variables.repoImageName }}:$(datetime)-$(commit) -f kubernetes/linux/Dockerfile.multiarch --metadata-file $(Build.ArtifactStagingDirectory)/metadata.json --build-arg IMAGE_TAG=$(datetime)-$(commit) --push .
+
+      docker pull ${{ variables.repoImageName }}:$(datetime)-$(commit)
+
+- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+  displayName: 'Generation Task'
+  inputs:
+    BuildDropPath: '$(Build.ArtifactStagingDirectory)'
+    DockerImagesToScan: 'golang:1.14, ubuntu:18.04, ${{ variables.repoImageName }}:$(datetime)-$(commit)'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathToPublish: '$(Build.ArtifactStagingDirectory)'
+    artifactName: drop

.pipelines/azure_pipeline_prod.yaml

@@ -0,0 +1,100 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- ci_prod
+
+pool:
+  name: Azure-Pipelines-CI-Prod-EO
+
+variables:
+  armServiceConnectionName: 'ci-1es-acr-connection-prod'
+  subscription: '30c56c3a-54da-46ea-b004-06eb33432687'
+  containerRegistry: 'containerinsightsbuild'
+  repoImageName: '${{ variables.containerRegistry }}.azurecr.io/official/linux'
+
+steps:
+- bash: |
+    commit=$(git rev-parse --short HEAD)
+    echo "##vso[task.setvariable variable=commit;]$commit"
+
+    datetime=$(date +'%Y%m%d%s')
+    echo "##vso[task.setvariable variable=datetime;]$datetime"
+
+    cd deployment/multiarch-agent-deployment/ServiceGroupRoot/Scripts
+    tar -czvf ../artifacts.tar.gz pushAgentToAcr.sh
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment artifacts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/deployment"
+    Contents: |
+      **/*
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/.pipelines"
+    Contents: |
+      **/*.sh
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/kubernetes"
+    Contents: |
+      *.yaml
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/charts"
+    Contents: |
+      **/*
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: CopyFiles@2
+  displayName: "Copy ev2 deployment scripts"
+  inputs:
+    SourceFolder: "$(Build.SourcesDirectory)/test/e2e"
+    Contents: |
+      *.yaml
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
+
+- task: AzureCLI@2
+  inputs:
+    azureSubscription: ${{ variables.armServiceConnectionName }}
+    scriptType: bash
+    scriptLocation: inlineScript
+    inlineScript: |
+
+      sudo apt-get update && sudo apt-get -y install qemu binfmt-support qemu-user-static
+      docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
+      docker buildx create --name testbuilder
+      docker buildx use testbuilder
+
+      az --version
+      az account show
+      az account set -s ${{ variables.subscription }}
+      az acr login -n ${{ variables.containerRegistry }}
+
+      docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ variables.repoImageName }}:ciprod-$(datetime)-$(commit) -f kubernetes/linux/Dockerfile.multiarch --metadata-file $(Build.ArtifactStagingDirectory)/metadata.json --build-arg IMAGE_TAG=ciprod-$(datetime)-$(commit) --push .
+
+      docker pull ${{ variables.repoImageName }}:ciprod-$(datetime)-$(commit)
+
+- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+  displayName: 'Generation Task'
+  inputs:
+    BuildDropPath: '$(Build.ArtifactStagingDirectory)'
+    DockerImagesToScan: 'golang:1.14, ubuntu:18.04, ${{ variables.repoImageName }}:ciprod-$(datetime)-$(commit)'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathToPublish: '$(Build.ArtifactStagingDirectory)'
+    artifactName: drop

README.md

@@ -151,6 +151,25 @@ bash build-and-publish-docker-image.sh --image <repo>/<imagename>:<imagetag>
 ```
 > Note: format of the imagetag will be `ci<release><MMDDYYYY>`. possible values for release are test, dev, preview, dogfood, prod etc.
 
+You can also build and push images for multiple architectures. This is powered by docker buildx
+```
+cd ~/Docker-Provider/kubernetes/linux/dockerbuild
+sudo docker login # if you want to publish the image to acr then login to acr via `docker login <acr-name>`
+# build and publish using docker buildx
+bash build-and-publish-docker-image.sh --image <repo>/<imagename>:<imagetag> --multiarch
+```
+
+or directly use the docker buildx commands
+```
+# multiple platforms
+cd ~/Docker-Provider
+docker buildx build --platform linux/arm64/v8,linux/amd64 -t <repo>/<imagename>:<imagetag> --build-arg IMAGE_TAG=<imagetag> -f kubernetes/linux/Dockerfile.multiarch --push .
+
+# single platform
+cd ~/Docker-Provider
+docker buildx build --platform linux/amd64 -t <repo>/<imagename>:<imagetag> --build-arg IMAGE_TAG=<imagetag> -f kubernetes/linux/Dockerfile.multiarch --push .
+```
+
 If you prefer to build docker provider shell bundle and image separately, then you can follow below instructions
 
 ##### Build Docker Provider shell bundle

build/linux/Makefile

@@ -11,10 +11,16 @@ BUILD_TYPE=Release
 PF=Linux
 PF_MAJOR=1
 PF_MINOR=0
-PF_ARCH=x64
 PF_WIDTH=64
 PF_DISTRO=ULINUX
-BUILD_CONFIGURATION=Linux_ULINUX_1.0_x64_64_Release
+
+ifeq ($(arch),)
+	PF_ARCH=amd64
+else
+	PF_ARCH=$(arch)
+endif
+
+BUILD_CONFIGURATION=Linux_ULINUX_1.0_$(PF_ARCH)_64_Release
 
 # RM - Remove a file
 # RMDIR - Remove a directory
@@ -90,16 +96,7 @@ endif
 
 STAGING_DIR := $(INTERMEDIATE_DIR)/staging
 
-# For consistency, the architecture should be i686 (for x86) and x86_64 (for x64)
-DOCKER_ARCH := $(shell echo $(PF_ARCH) | sed -e 's/x86$$/i686/' -e 's/x64$$/x86_64/')
-OUTPUT_PACKAGE_PREFIX=docker-cimprov-$(CONTAINER_BUILDVERSION_MAJOR).$(CONTAINER_BUILDVERSION_MINOR).$(CONTAINER_BUILDVERSION_PATCH)-$(CONTAINER_BUILDVERSION_BUILDNR).universal.$(DOCKER_ARCH)
-
-
-ifeq ("$(wildcard /usr/bin/dpkg-deb)","")
-	DPKG_LOCATION="--DPKG_LOCATION=$(BASE_DIR)/build/linux/installer/InstallBuilder/tools/bin/dpkg-deb-$(PF_ARCH)"
-else
-	DPKG_LOCATION=
-endif
+OUTPUT_PACKAGE_PREFIX=docker-cimprov-$(CONTAINER_BUILDVERSION_MAJOR).$(CONTAINER_BUILDVERSION_MINOR).$(CONTAINER_BUILDVERSION_PATCH)-$(CONTAINER_BUILDVERSION_BUILDNR).universal.$(PF_ARCH)
 
 
 #--------------------------------------------------------------------------------
@@ -130,7 +127,7 @@ KIT_STATUS:
 fluentbitplugin :
 	@echo "========================= Building fluentbit out_oms go plugin for logs"
 	$(MKPATH) $(INTERMEDIATE_DIR)
-	make -C $(GO_SOURCE_DIR) fbplugin
+	make -C $(GO_SOURCE_DIR) fbplugin arch=$(PF_ARCH)
 	$(COPY) $(GO_SOURCE_DIR)/out_oms.so $(INTERMEDIATE_DIR)
 
 rubypluginstests :
@@ -192,7 +189,6 @@ kit : fluentbitplugin
 		--VERSION=$(CONTAINER_BUILDVERSION_MAJOR).$(CONTAINER_BUILDVERSION_MINOR).$(CONTAINER_BUILDVERSION_PATCH) \
 		--RELEASE=$(CONTAINER_BUILDVERSION_BUILDNR) \
 		--CONTAINER_BUILD_LIBRARY=$(CONTAINERLIB_FILENAME) \
-		$(DPKG_LOCATION) \
 		--OUTPUTFILE=$(OUTPUT_PACKAGE_PREFIX) \
 		--DATAFILE_PATH=$(BASE_DIR)/build/linux/installer/datafiles \
 		base_container.data linux.data linux_dpkg.data

deployment/multiarch-agent-deployment/ServiceGroupRoot/Parameters/ContainerInsights.Linux.Parameters.json

@@ -0,0 +1,68 @@
+{
+    "$schema": "http://schema.express.azure.com/schemas/2015-01-01-alpha/RolloutParameters.json",
+    "contentVersion": "1.0.0.0",
+    "wait": [
+      {
+        "name": "waitSdpBakeTime",
+        "properties": {
+          "duration": "PT24H"
+        }
+      }
+    ],
+    "shellExtensions": [
+      {
+        "name": "PushAgentToACR",
+        "type": "ShellExtensionType",
+        "properties": {
+          "maxexecutiontime": "PT1H"
+        },
+        "package": {
+          "reference": {
+            "path": "artifacts.tar.gz"
+          }
+        },
+        "launch": {
+          "command": [
+            "/bin/bash",
+            "pushAgentToAcr.sh"
+          ],
+          "environmentVariables": [
+            {
+              "name": "ACR_NAME",
+              "value": "__ACR_NAME__"
+            },
+            {
+              "name": "AGENT_RELEASE",
+              "value": "__AGENT_RELEASE__"
+            },
+            {
+              "name": "AGENT_IMAGE_TAG_SUFFIX",
+              "value": "__AGENT_IMAGE_TAG_SUFFIX__"
+            },
+            {
+              "name": "AGENT_IMAGE_FULL_PATH",
+              "value": "public/azuremonitor/containerinsights/__AGENT_RELEASE__:__AGENT_RELEASE____AGENT_IMAGE_TAG_SUFFIX__"
+            }, 
+            {
+              "name": "CDPX_REGISTRY",
+              "value": "__CDPX_LINUX_REGISTRY__"
+            },
+            {
+              "name": "CDPX_REPO_NAME",
+              "value": "__CDPX_LINUX_REPO_NAME__"
+            },
+            {
+              "name": "CDPX_TAG",
+              "value": "__CDPX_LINUX_TAG__"
+            }
+          ], 
+          "identity": {
+            "type": "userAssigned",
+            "userAssignedIdentities": [
+              "__MANAGED_IDENTITY__"
+            ]
+          }
+        }
+      }
+    ]
+  }

deployment/multiarch-agent-deployment/ServiceGroupRoot/RolloutSpecs/RolloutSpecs.json

@@ -0,0 +1,29 @@
+{
+    "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/rolloutSpecification.json",
+    "ContentVersion": "1.0.0.0",
+    "RolloutMetadata": {
+      "ServiceModelPath": "ServiceModels//Public.ServiceModel.json",   
+      "ScopeBindingsPath": "ScopeBindings//Public.ScopeBindings.json", 
+      "Name": "ContainerInsightsAgent",
+      "RolloutType": "Major",
+      "BuildSource": {
+        "Parameters": {
+          "VersionFile": "buildver.txt"
+        }
+      },
+      "Notification": {
+        "Email": {
+          "To": "omscontainers@microsoft.com"
+        }
+      }  
+    },
+    "OrchestratedSteps": [
+      {
+        "name": "PushLinuxAgent",
+        "targetType": "ServiceResource",
+        "targetName": "PushLinuxAgent",
+        "actions": [ "Shell/PushAgentToACR" ],
+        "dependsOn": [ ]
+      }
+    ]
+  }