[1.20] merge staging to release branch (#1612)

* Merge main to staging-1.20 (#1583) * Bump revision 1.20.2-asm.0 (#1559) * Drop legacy telemetry isntall (#1566) * rename rhel cni (#1567) * Bump revision 1.20.3-asm.5 (#1569) * Bump revision 1.20.3-asm.5 * Update google-cloud packages * Update revision 1.20.3-asm.4 (#1579) --------- Co-authored-by: Hemendra Teli <[email protected]> * Merge main -> staging-1.20 (#1590) * Bump revision 1.20.2-asm.0 (#1559) * Drop legacy telemetry isntall (#1566) * rename rhel cni (#1567) * Bump revision 1.20.3-asm.5 (#1569) * Bump revision 1.20.3-asm.5 * Update google-cloud packages * Update revision 1.20.3-asm.4 (#1579) * Update revision 1.20.4-asm.0 (#1587) --------- Co-authored-by: Hemendra Teli <[email protected]> * Merge main -> staging-1.20 (#1597) * Bump revision 1.20.2-asm.0 (#1559) * Drop legacy telemetry isntall (#1566) * rename rhel cni (#1567) * Bump revision 1.20.3-asm.5 (#1569) * Bump revision 1.20.3-asm.5 * Update google-cloud packages * Update revision 1.20.3-asm.4 (#1579) * Update revision 1.20.4-asm.0 (#1587) * Fix cloud-sdk:slim (#1596) --------- Co-authored-by: Hemendra Teli <[email protected]> * Bump revision 1.20.6-asm.0 * Bump rev 1.20.7-asm.2 --------- Co-authored-by: Hemendra Teli <[email protected]>
GoogleCloudPlatform · Jun 5, 2024 · 0a7d23f · 0a7d23f
1 parent 47c7435
commit 0a7d23f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/asm/Kptfile b/asm/Kptfile
@@ -76,7 +76,7 @@ openAPI:
       x-k8s-cli:
         setter:
           name: anthos.servicemesh.tag
-          value: 1.20.6-asm.0
+          value: 1.20.7-asm.2
           isSet: true
     io.k8s.cli.setters.anthos.servicemesh.managed-controlplane.vpcsc.enabled:
       type: string

diff --git a/asmcli/asmcli b/asmcli/asmcli
diff --git a/asmcli/asmcli.sh b/asmcli/asmcli.sh
@@ -36,8 +36,8 @@ _CI_I_AM_A_TEST_ROBOT="${_CI_I_AM_A_TEST_ROBOT:=0}"; readonly _CI_I_AM_A_TEST_RO
 ### Internal variables ###
 MAJOR="${MAJOR:=1}"; readonly MAJOR;
 MINOR="${MINOR:=20}"; readonly MINOR;
-POINT="${POINT:=6}"; readonly POINT;
-REV="${REV:=0}"; readonly REV;
+POINT="${POINT:=7}"; readonly POINT;
+REV="${REV:=2}"; readonly REV;
 CONFIG_VER="${CONFIG_VER:="1"}"; readonly CONFIG_VER;
 K8S_MINOR=0