[1.16] Merge staging to release branch (#1459)

* Staging 1.16 (#1413) * Silence curl when downloading files but keep showing errors (#1407) The -s flag puts curl into silent mode, disabling the progress meter and warnings or errors. The -S flag in combination with -s re-enables error output in case curl fails. * Remove reference to deprecated command (#1406) * use managed cni by default (#1410) --------- Co-authored-by: Florian Rathgeber <[email protected]> Co-authored-by: Clay <[email protected]> * Bump revision 1.16.4-asm.2 (#1421) * Bump revision 1.16.4-asm.8 (#1431) * Bump revision 1.16.4-asm.14 (#1445) * Add logging output file in output dir (#1426) * Add logging output file in output dir * Create logs after determination of OUTPUT_DIR * Remove unused log file relocation logic * Remove unused log file relocation logic * Remove unused log file relocation logic * Remove unused log file relocation logic * Remove unused log file relocation logic * Add --working-dir alias for output directory (#1428) * Switch to gke.gcr.io alias (#1447) * Support offline mode in create-mesh (#1448) * Compatibility for create-mesh offline fixes (#1452) * Bump asm 1.16.5-asm.2 (#1456) * Better handling of offline mode for create-mesh (#1454) * Better handling of offline mode for create-mesh * Fix usage message * Use relative istioctl location if possible --------- Co-authored-by: Zhengzhe Yang <[email protected]> Co-authored-by: Florian Rathgeber <[email protected]> Co-authored-by: Clay <[email protected]> Co-authored-by: Wonje Kang <[email protected]>
GoogleCloudPlatform · Jun 13, 2023 · b385ffe · b385ffe
1 parent c6af9c0
commit b385ffe
Show file tree

Hide file tree

Showing 19 changed files with 198 additions and 100 deletions.
diff --git a/asm/Kptfile b/asm/Kptfile
@@ -71,12 +71,12 @@ openAPI:
       x-k8s-cli:
         setter:
           name: anthos.servicemesh.hub
-          value: gcr.io/gke-release/asm
+          value: gke.gcr.io/asm
     io.k8s.cli.setters.anthos.servicemesh.tag:
       x-k8s-cli:
         setter:
           name: anthos.servicemesh.tag
-          value: 1.16.4-asm.14
+          value: 1.16.5-asm.2
           isSet: true
     io.k8s.cli.setters.anthos.servicemesh.managed-controlplane.vpcsc.enabled:
       type: string
@@ -113,7 +113,7 @@ openAPI:
       x-k8s-cli:
         setter:
           name: anthos.servicemesh.canonicalServiceHub
-          value: gcr.io/gke-release/asm/canonical-service-controller:1.7.3-asm.6
+          value: gke.gcr.io/asm/canonical-service-controller:1.7.3-asm.6
           isSet: true
     io.k8s.cli.setters.anthos.servicemesh.idp-url:
       type: string

diff --git a/asm/canonical-service/controller.yaml b/asm/canonical-service/controller.yaml
@@ -327,7 +327,7 @@ spec:
         - --enable-leader-election
         command:
         - /manager
-        image: gcr.io/gke-release/asm/canonical-service-controller:1.10.3-asm.16 # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.canonicalServiceHub"}
+        image: gke.gcr.io/asm/canonical-service-controller:1.10.3-asm.16 # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.canonicalServiceHub"}
         name: manager
         resources:
           limits:

diff --git a/asm/istio/expansion/vm-eastwest-gateway.yaml b/asm/istio/expansion/vm-eastwest-gateway.yaml
@@ -19,7 +19,7 @@ metadata:
   name: eastwest
 spec:
   profile: empty
-  hub: gcr.io/gke-release/asm # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.hub"}
+  hub: gke.gcr.io/asm # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.hub"}
   tag: 1.10.2-asm.1 # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.tag"}
   components:
     ingressGateways:

diff --git a/asm/istio/istio-operator.yaml b/asm/istio/istio-operator.yaml
@@ -17,7 +17,7 @@ apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 spec:
   profile: empty
-  hub: gcr.io/gke-release/asm # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.hub"}
+  hub: gke.gcr.io/asm # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.hub"}
   tag: 1.10.2-asm.1 # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.tag"}
   meshConfig:
     trustDomainAliases: # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.trustDomainAliases"}

diff --git a/asm/istio/options/managed-control-plane.yaml b/asm/istio/options/managed-control-plane.yaml
@@ -18,7 +18,7 @@ kind: IstioOperator
 spec:
   revision: "asm-managed"
   profile: asm-gcp
-  hub: gcr.io/gke-release/asm # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.hub"}
+  hub: gke.gcr.io/asm # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.hub"}
   tag: 1.10.2-asm.1 # {"$ref":"#/definitions/io.k8s.cli.setters.anthos.servicemesh.tag"}
   components:
     base:

diff --git a/asmcli/README.md b/asmcli/README.md
@@ -78,7 +78,7 @@ instead of executing them, or use the `--verbose` flag to display _and_ execute
 the commands. Combine the --verbose flag with --help to see extended help.
 
 The script will by default create a temporary directory in order to download
-files and configuration necessary for installing ASM. Specify the --output-dir
+files and configuration necessary for installing ASM. Specify the `--output-dir` (or `--working-dir`)
 flag in order to designate an existing folder to use instead. Upon completion,
 the directory will contain the configuration used for installationm, as well as
 the ASM package which notably contains the istioctl binary for the installed

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:=16}"; readonly MINOR;
-POINT="${POINT:=4}"; readonly POINT;
-REV="${REV:=14}"; readonly REV;
+POINT="${POINT:=5}"; readonly POINT;
+REV="${REV:=2}"; readonly REV;
 CONFIG_VER="${CONFIG_VER:="1"}"; readonly CONFIG_VER;
 K8S_MINOR=0
 

diff --git a/asmcli/commands/build-offline-package.sh b/asmcli/commands/build-offline-package.sh
@@ -25,7 +25,7 @@ build-offline-package() {
 build-offline-package_parse_args() {
   while [[ $# != 0 ]]; do
     case "${1}" in
-      -D | --output_dir | --output-dir)
+      -D | --output_dir | --output-dir | --working_dir | --working-dir)
         arg_required "${@}"
         context_set-option "OUTPUT_DIR" "${2}"
         shift 2