Skip to content

Commit

Permalink
Merge staging-1.16 to release-1.16 (#1497)
Browse files Browse the repository at this point in the history
* 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

* Better logging/handling for offline create-mesh (#1464)

* Bump rev 1.16.6-asm.3 (#1468)

* Bump revision 1.16.7-asm.0 (#1474)

* Bump revision 1.16.7-asm.7 (#1491)

---------

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]>
  • Loading branch information
5 people authored Sep 6, 2023
1 parent 9af8caa commit 4b0c2fc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion asm/Kptfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ openAPI:
x-k8s-cli:
setter:
name: anthos.servicemesh.tag
value: 1.16.7-asm.0
value: 1.16.7-asm.7
isSet: true
io.k8s.cli.setters.anthos.servicemesh.managed-controlplane.vpcsc.enabled:
type: string
Expand Down
2 changes: 1 addition & 1 deletion asmcli/asmcli

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion asmcli/asmcli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ _CI_I_AM_A_TEST_ROBOT="${_CI_I_AM_A_TEST_ROBOT:=0}"; readonly _CI_I_AM_A_TEST_RO
MAJOR="${MAJOR:=1}"; readonly MAJOR;
MINOR="${MINOR:=16}"; readonly MINOR;
POINT="${POINT:=7}"; readonly POINT;
REV="${REV:=0}"; readonly REV;
REV="${REV:=7}"; readonly REV;
CONFIG_VER="${CONFIG_VER:="1"}"; readonly CONFIG_VER;
K8S_MINOR=0

Expand Down

0 comments on commit 4b0c2fc

Please sign in to comment.