Merge branch 'master' into prefixOnNicv6Support

Signed-off-by: NihaNallappagari <[email protected]>

Author: NihaNallappagari

.github/dependabot.yaml

@@ -5,8 +5,6 @@ updates:
   directory: "/"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "ci"
   labels: [ "ci", "dependencies" ]
@@ -15,8 +13,6 @@ updates:
   directory: "/"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "ci"
   labels: [ "ci", "dependencies" ]
@@ -25,8 +21,6 @@ updates:
   directory: "/"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
   labels: [ "dependencies" ]
@@ -35,8 +29,6 @@ updates:
   directory: "/azure-ipam"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
   labels: [ "dependencies", "azure-ipam" ]
@@ -45,8 +37,6 @@ updates:
   directory: "/build/tools"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
   labels: [ "dependencies" ]
@@ -71,8 +61,6 @@ updates:
   directory: "/"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
   labels: [ "dependencies", "release/1.5" ]
@@ -82,8 +70,6 @@ updates:
   directory: "/azure-ipam"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
   labels: [ "dependencies", "azure-ipam", "release/1.5" ]
@@ -93,8 +79,6 @@ updates:
   directory: "/"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
   labels: [ "dependencies", "release/1.4" ]
@@ -104,8 +88,6 @@ updates:
   directory: "/azure-ipam"
   schedule:
     interval: "daily"
-  reviewers:
-    - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
   labels: [ "dependencies", "azure-ipam", "release/1.4" ]

.github/workflows/stale.yaml

@@ -16,14 +16,15 @@ jobs:
         id: stale
         with:
           ascending: true
-          close-issue-message: 'Issue closed due to inactivity.'
           close-pr-message: 'Pull request closed due to inactivity.'
-          days-before-close: 7
           days-before-stale: 14
+          days-before-issue-close: -1
+          days-before-pr-close: 7
           delete-branch: true
           exempt-issue-labels: 'exempt-stale'
+          exempt-pr-labels: 'exempt-stale,dependencies,ci'
           operations-per-run: 100
-          stale-issue-message: 'This issue is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days'
+          stale-issue-message: 'This issue is stale because it has been open for 2 weeks with no activity. Remove stale label or comment to keep it open.'
           stale-pr-message: 'This pull request is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days'
       - name: Print outputs
         run: echo ${{ join(steps.stale.outputs.*, ',') }}

.golangci.yml

@@ -9,11 +9,8 @@ linters:
   - format
   - performance
   - unused
-  disable:
-  - maligned
-  - scopelint
   enable:
-  - exportloopref
+  - copyloopvar
   - goconst
   - gocritic
   - gocyclo

.pipelines/build/dockerfiles/azure-ip-masq-merger.Dockerfile

@@ -0,0 +1,7 @@
+ARG ARCH
+
+FROM scratch AS linux
+ARG ARTIFACT_DIR
+
+COPY ${ARTIFACT_DIR}/bin/azure-ip-masq-merger /azure-ip-masq-merger
+ENTRYPOINT ["/azure-ip-masq-merger"]

.pipelines/build/dockerfiles/cni.Dockerfile

@@ -1,8 +1,9 @@
+# !! AUTOGENERATED - DO NOT EDIT !!
+# SOURCE: .pipelines/build/dockerfiles/cni.Dockerfile.tmpl
 ARG ARCH
 
-
-# skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
-FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
+# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
+FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
 ARG ARTIFACT_DIR .
 
 COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe

.pipelines/build/dockerfiles/cni.Dockerfile.tmpl

@@ -0,0 +1,17 @@
+# {{.RENDER_MSG}}
+# SOURCE: {{.SRC_PIPE}}
+ARG ARCH
+
+# {{.WIN_HPC_IMG}}
+FROM --platform=windows/${ARCH} {{.WIN_HPC_PIN}} AS windows
+ARG ARTIFACT_DIR .
+
+COPY ${ARTIFACT_DIR}/bin/dropgz.exe /dropgz.exe
+ENTRYPOINT [ "/dropgz.exe" ]
+
+
+FROM scratch AS linux
+ARG ARTIFACT_DIR .
+
+COPY ${ARTIFACT_DIR}/bin/dropgz /dropgz
+ENTRYPOINT [ "/dropgz" ]

.pipelines/build/dockerfiles/cns.Dockerfile

@@ -1,24 +1,21 @@
+# !! AUTOGENERATED - DO NOT EDIT !!
+# SOURCE: .pipelines/build/dockerfiles/cns.Dockerfile.tmpl
 ARG ARCH
 
-
 # mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
 FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
 ARG ARTIFACT_DIR .
 
-COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
-COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1
 COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
 ENTRYPOINT ["azure-cns.exe"]
 EXPOSE 10090
 
-
-# mcr.microsoft.com/cbl-mariner/base/core:2.0
-# skopeo inspect docker://mcr.microsoft.com/cbl-mariner/base/core:2.0 --format "{{.Name}}@{{.Digest}}"
-FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:961bfedbbbdc0da51bc664f51d959da292eced1ad46c3bf674aba43b9be8c703 AS build-helper
+# mcr.microsoft.com/azurelinux/base/core:3.0
+FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:9948138108a3d69f1dae62104599ac03132225c3b7a5ac57b85a214629c8567d AS build-helper
 RUN tdnf install -y iptables
 
-# mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:7778a86d86947d5f64c1280a7ee0cf36c6c6d76b5749dd782fbcc14f113961bf AS linux
+# mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:0801b80a0927309572b9adc99bd1813bc680473175f6e8175cd4124d95dbd50c AS linux
 ARG ARTIFACT_DIR .
 
 COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/

.pipelines/build/dockerfiles/cns.Dockerfile.tmpl

@@ -0,0 +1,25 @@
+# {{.RENDER_MSG}}
+# SOURCE: {{.SRC_PIPE}}
+ARG ARCH
+
+# {{.WIN_HPC_IMG}}
+FROM --platform=windows/${ARCH} {{.WIN_HPC_PIN}} AS windows
+ARG ARTIFACT_DIR .
+
+COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
+ENTRYPOINT ["azure-cns.exe"]
+EXPOSE 10090
+
+# {{.MARINER_CORE_IMG}}
+FROM --platform=linux/${ARCH} {{.MARINER_CORE_PIN}} AS build-helper
+RUN tdnf install -y iptables
+
+# {{.MARINER_DISTROLESS_IMG}}
+FROM --platform=linux/${ARCH} {{.MARINER_DISTROLESS_PIN}} AS linux
+ARG ARTIFACT_DIR .
+
+COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/
+COPY --from=build-helper /usr/lib /usr/lib
+COPY ${ARTIFACT_DIR}/bin/azure-cns /usr/local/bin/azure-cns
+ENTRYPOINT [ "/usr/local/bin/azure-cns" ]
+EXPOSE 10090

.pipelines/build/manifests.jobs.yaml

@@ -36,3 +36,31 @@ jobs:
         image_repository: ${{ job_data.templateContext.name }}
         image_tag: ${{ job_data.templateContext.image_tag }}
         manifest_data: $(MANIFEST_JSON)
+
+  - job: ${{ job_data.job }}_package_manifest
+    displayName: "Package Image Manifest - ${{ job_data.job }}"
+    dependsOn:
+    - ${{ job_data.job }}_publish_manifest
+    pool:
+      type: linux
+    variables:
+      LinuxContainerImage: 'mcr.microsoft.com/onebranch/azurelinux/build:3.0'
+      ob_outputDirectory: $(Build.SourcesDirectory)/out
+      ob_git_checkout: false
+    steps:
+    # Leverage new feature from https://github.com/oras-project/oras/issues/1366 in the future
+    # :v1 has no impact, but is required for oras
+    # Copy manifest from ACR
+    - bash: |
+        oras copy $(ACR).azurecr.io/$(IMAGE_REPO_PATH)/${{ job_data.templateContext.name }}:${{ job_data.templateContext.image_tag }} \
+        --to-oci-layout ./${{ job_data.templateContext.image_tag }}_artifact:v1
+      name: oras_copy
+      displayName: "Oras Copy"
+
+    # Generate tarball
+    - bash: |
+        TARGET_DIR=$(ob_outputDirectory)
+        mkdir -p "$TARGET_DIR"
+        tar -cvzf ${TARGET_DIR}/${{ job_data.templateContext.image_tag }}_artifact.tar.gz ./${{ job_data.templateContext.image_tag }}_artifact
+      name: tarball
+      displayName: "Generate tarball"

.pipelines/build/ob-prepare.steps.yaml

@@ -1,4 +1,3 @@
-
 steps:
 - template: utils/rename-dockerfile-references.steps.yaml
   parameters:
@@ -59,6 +58,10 @@ steps:
     echo "##vso[task.setvariable variable=azureIpamVersion;isOutput=true]$AZUREIPAMVERSION"
     echo "azureIpamVersion: $AZUREIPAMVERSION"
 
+    AZUREIPMASQMERGERVERSION=$(make azure-ip-masq-merger-version)
+    echo "##vso[task.setvariable variable=azureIpMasqMergerVersion;isOutput=true]$AZUREIPMASQMERGERVERSION"
+    echo "azureIpMasqMergerVersion: $AZUREIPMASQMERGERVERSION"
+
     CNIVERSION=$(make cni-version)
     echo "##vso[task.setvariable variable=cniVersion;isOutput=true]$CNIVERSION"
     echo "cniVersion: $CNIVERSION"