Update osm-arc version to 1.2.6-beta-1. (#178)

* Update OSM-Arc version to v1.2.5-beta-1 Signed-off-by: nshankar <[email protected]> * Update chart Signed-off-by: nshankar <[email protected]> * update upstream repo Signed-off-by: nshankar <[email protected]> * Update checkout and agent pools Signed-off-by: nshankar <[email protected]> * Update version and fix checkout Signed-off-by: nshankar <[email protected]> * Rm unique tag Signed-off-by: nshankar <[email protected]> * unpin k8s-extension Signed-off-by: nshankar <[email protected]> * Update timeout Signed-off-by: nshankar <[email protected]> * Increase timeout Signed-off-by: nshankar <[email protected]> --------- Signed-off-by: nshankar <[email protected]> Co-authored-by: nshankar <[email protected]>
Azure · Aug 28, 2023 · c22536b · c22536b
1 parent 0122837
commit c22536b
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 22 deletions.
diff --git a/.pipelines/aks-addon-nightly/e2e-aks-addon-jobs.yaml b/.pipelines/aks-addon-nightly/e2e-aks-addon-jobs.yaml
@@ -1,6 +1,6 @@
 jobs:
   - job: test_osm_aks_addon
-    pool: staging-pool
+    pool: staging-pool-amd64-mariner-2
     workspace:
       clean: all
     steps:

diff --git a/.pipelines/aks-addon-nightly/e2e-aks-addon.yaml b/.pipelines/aks-addon-nightly/e2e-aks-addon.yaml
@@ -8,7 +8,7 @@ schedules:
       include:
         - main
 
-pool: staging-pool
+pool: staging-pool-amd64-mariner-2
 
 variables:
   KUBECONFIG: $(System.DefaultWorkingDirectory)/kubeconfig.json

diff --git a/.pipelines/conformance-test-job/push-osm-arc-conf-plugin.yaml b/.pipelines/conformance-test-job/push-osm-arc-conf-plugin.yaml
@@ -1,6 +1,6 @@
 jobs: 
   - job: push_osm_arc_plugin
-    pool: staging-pool
+    pool: staging-pool-amd64-mariner-2
     workspace: 
       clean: all
     steps:

diff --git a/.pipelines/nightly-image-scan/image-scan-job.yaml b/.pipelines/nightly-image-scan/image-scan-job.yaml
@@ -1,6 +1,6 @@
 jobs: 
   - job: nightly_image_scan
-    pool: staging-pool
+    pool: staging-pool-amd64-mariner-2
     workspace: 
       clean: all
     steps:

diff --git a/.pipelines/pr-job/e2e-aks-arc.yaml b/.pipelines/pr-job/e2e-aks-arc.yaml
@@ -5,7 +5,8 @@ parameters:
 
 jobs: 
   - job: test_osm_chart_arc_cluster
-    pool: staging-pool
+    timeoutInMinutes: 120
+    pool: staging-pool-amd64-mariner-2
     workspace: 
       clean: all
     steps: 

diff --git a/.pipelines/pr-job/e2e-job.yaml b/.pipelines/pr-job/e2e-job.yaml
@@ -30,7 +30,7 @@ variables:
   image.dir: $(Build.ArtifactStagingDirectory)
   image.artifact.name: drop
   KUBECONFIG: $(System.DefaultWorkingDirectory)/kubeconfig.json
-  upstream.repo: https://github.com/openservicemesh/osm
+  upstream.repo: https://github.com/Azure/osm
 
 stages: 
 - stage: run_e2e

diff --git a/.pipelines/templates/checkout-upstream-repo.yaml b/.pipelines/templates/checkout-upstream-repo.yaml
@@ -1,4 +1,14 @@
+parameters: 
+  - name: ghUser
+    type: string
+    default: "osm-user"
+  - name: osmRepo
+    type: string
+    default: "Azure/osm"
+
 steps:
   - bash: |
-      git clone $(upstream.repo) $(System.DefaultWorkingDirectory)/osm
+      git clone https://${{ parameters.ghUser }}:$(AZURE_OSM_TOKEN)@github.com/${{ parameters.osmRepo }}
     displayName: Checkout $(upstream.repo)
+    env:
+      AZURE_OSM_TOKEN: $(AZURE_OSM_TOKEN)
diff --git a/.pipelines/templates/publish-helm-chart.yaml b/.pipelines/templates/publish-helm-chart.yaml
@@ -2,6 +2,9 @@ parameters:
   - name: releaseTag
     type: boolean
     default: false
+  - name: uniqueTag
+    type: boolean
+    default: false
 
 steps: 
   - bash: |
@@ -23,12 +26,22 @@ steps:
     displayName: Create Unique Tag
   - script: |
       echo ${{ lower(parameters.releaseTag) }}
-      if [[ ${{ lower(parameters.releaseTag) }} == "true" ]]; then
-        # Add "-release" for chart created by release job.  
-        echo "##vso[task.setvariable variable=IMAGE_TAG]${CHART_VERSION}-${UNIQUE_TAG}-release"
+      if [[ ${{ lower(parameters.uniqueTag) }} == "true" ]]; then
+        if [[ ${{ lower(parameters.releaseTag) }} == "true" ]]; then
+          # Add "-release" for chart created by release job.  
+          echo "##vso[task.setvariable variable=IMAGE_TAG]${CHART_VERSION}-${UNIQUE_TAG}-release"
+        else
+          # Add "-pr" for chart created by pr job.  
+          echo "##vso[task.setvariable variable=IMAGE_TAG]${CHART_VERSION}-${UNIQUE_TAG}-pr"
+        fi
       else
-        # Add "-pr" for chart created by pr job.  
-        echo "##vso[task.setvariable variable=IMAGE_TAG]${CHART_VERSION}-${UNIQUE_TAG}-pr"
+        if [[ ${{ lower(parameters.releaseTag) }} == "true" ]]; then
+          # Add "-release" for chart created by release job.  
+          echo "##vso[task.setvariable variable=IMAGE_TAG]${CHART_VERSION}-release"
+        else
+          # Add "-pr" for chart created by pr job.  
+          echo "##vso[task.setvariable variable=IMAGE_TAG]${CHART_VERSION}-pr"
+        fi
       fi
       echo ${IMAGE_TAG}
     displayName: Create image tag 

diff --git a/.pipelines/templates/run-upstream-e2e.yaml b/.pipelines/templates/run-upstream-e2e.yaml
@@ -24,7 +24,7 @@ steps:
 
       make build-osm
       # Skipping ingressbackend e2e test until nginx-AKS issue is resolved. 
-      go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -ginkgo.skip="\bIngress using IngressBackend API\b" -ginkgo.skip="\bTest reinstalling OSM in the same namespace with the same mesh name\b" -test.timeout 60m -installType=NoInstall -OsmNamespace=$(release.namespace)
+      go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -ginkgo.skip="\bIngress using IngressBackend API\b" -ginkgo.skip="\bTest reinstalling OSM in the same namespace with the same mesh name\b" -test.timeout 120m -installType=NoInstall -OsmNamespace=$(release.namespace)
     displayName: "Run upstream e2e tests"
     env:
       CTR_REGISTRY: $(UPSTREAM_DOCKER_REGISTRY)

diff --git a/.pipelines/test-prod-job/osm-arc-prod.yaml b/.pipelines/test-prod-job/osm-arc-prod.yaml
@@ -1,6 +1,6 @@
 jobs: 
   - job: test_osm_arc_prod
-    pool: staging-pool
+    pool: staging-pool-amd64-mariner-2
     workspace: 
       clean: all
     steps:

diff --git a/.pipelines/upgrade-job/upgrade-e2e-job.yaml b/.pipelines/upgrade-job/upgrade-e2e-job.yaml
@@ -26,7 +26,7 @@ variables:
   image.dir: $(Build.ArtifactStagingDirectory)
   image.artifact.name: drop
   KUBECONFIG: $(System.DefaultWorkingDirectory)/kubeconfig.json
-  upstream.repo: https://github.com/openservicemesh/osm
+  upstream.repo: https://github.com/Azure/osm
 
 stages: 
 - stage: run_e2e

diff --git a/charts/osm-arc/Chart.yaml b/charts/osm-arc/Chart.yaml
@@ -15,14 +15,14 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.3
+version: 1.2.6-beta-1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v1.2.3
+appVersion: v1.2.6-beta-1
 
 dependencies:
 - name: osm
-  version: "1.2.3"
-  repository: "https://openservicemesh.github.io/osm"
+  version: "1.2.6"
+  repository: "https://azure.github.io/osm"
diff --git a/charts/osm-arc/values.yaml b/charts/osm-arc/values.yaml
@@ -21,13 +21,13 @@ osm:
     enablePermissiveTrafficPolicy: true
     image:
       registry: mcr.microsoft.com/oss/openservicemesh
-      tag: v1.2.3
+      tag: v1.2.6
     enforceSingleMesh: true
     enableReconciler: false
     deployPrometheus: false
     deployJaeger: false
     webhookConfigNamePrefix: arc-osm-webhook
-    sidecarImage: mcr.microsoft.com/oss/envoyproxy/envoy:v1.22.2
+    sidecarImage: mcr.microsoft.com/oss/envoyproxy/envoy:v1.26.3
     osmController:
       podLabels: {
         app.kubernetes.io/component: osm-controller

diff --git a/scripts/install-k8s-extension.sh b/scripts/install-k8s-extension.sh
@@ -4,6 +4,6 @@ az account set --subscription="$SUBSCRIPTION" > /dev/null 2>&1
 
 az extension remove --name k8s-extension
 
-az extension add --name k8s-extension --version 1.3.5
+az extension add --name k8s-extension
 
 az -v