Skip to content

Commit

Permalink
Releasing GCP Kubeflow distribution v1.6.1 (#394)
Browse files Browse the repository at this point in the history
* Add shell in asm makefile. Fixes #389.

* Upgrade MySQL to 8.0

* Upgrade kfp to v2.0.0-alpha.5

* Update CHANGELOG

* Upgrade upstream to v1.6.1

* Add namespace spcification

* Update changelog and add a comment about CloudSQL

* Increase delay before deleting iap helper workloads to 90 sec

* Upgrade KFP to 2.0.0-alpha.6

* Update changelog

* Remove mysql version from comments

* Fix asmcli installation path

* Fix asmcli installation path

* Fix upstream folder in ASM

* Update upstream folder for asm
  • Loading branch information
gkcalat committed Oct 17, 2022
1 parent c95eafa commit 1641d19
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 18 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,26 @@

The Kubeflow on Google Cloud distribution versioning is following the versioning of [kubeflow/manifests](https://github.com/kubeflow/manifests).

### v1.6.0-rc.1
### v1.6.1

* Upgrade CloudSQL to MySQL 8.0 (#391)
* Upgrade KFP to v2.0.0-alpha.6
* Fix ASM bash issues (#389)

### v1.6.0

* Update CHANGELOG (#360)
* Migrate deprecated API calls (#349)
* Upgrade cert-manger to v1.5.0 (#372)
* Upgrade knative to v1.2 (#373)
* Upgrade ASM to v1.14 (#385)
* Upgrade KFP to v2.0.0-alpha.4
* Fix ASM/istio ingress gateway issue (#371)
* Migrate deprecated API calls (#349)
* Fix race condition in Kserve (#384)
* Fix deployment flakiness (#386)
* Remove deprecated KFServing (#375)
* Remove deprecated cloud-endpoints-controller (#377)
* Remove deprecated contrib/application

### v1.5.1

Expand Down
3 changes: 2 additions & 1 deletion kubeflow/apps/pipelines/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ resources:
- upstream/third-party/minio/options/istio
# ==== Database ====
# recommended, use cloud sql for easier maintenance
# CloudSQL was upgrade to MySQL 8.0 in Kubeflow 1.6.1 release
- cloudsql/proxy
# Altenatively, use in-cluster mysql by:
# Alternatively, use in-cluster mysql by:
# 1. remove gcs/pipeline-install-config-patch.yaml from patchesStrategicMerge
# 2. remove ../cloudsql/cnrm from ./cnrm/kustomization.yaml
# 3. comment cloudsql/proxy above, and uncomment the following line
Expand Down
16 changes: 8 additions & 8 deletions kubeflow/asm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# For example: 1.13.2-asm.5+config2:asmcli_1.13.2-asm.5-config2
# The part before colon symbol should be used for ASM_PACKAGE_VERSION.
# The part after colon symbol should be used for ASMCLI_SCRIPT_VERSION.

SHELL := /bin/bash
ASM_PACKAGE_VERSION=1.14.1-asm.3+config6
ASMCLI_SCRIPT_VERSION=asmcli_1.14.1-asm.3-config6

Expand All @@ -21,7 +21,7 @@ NAME=$(shell $(YQ) e '.data.name' kptconfig/kpt-setter-config.yaml)
PROJECT=$(shell $(YQ) e '.data."gcloud.core.project"' kptconfig/kpt-setter-config.yaml)
LOCATION=$(shell $(YQ) e '.data.location' kptconfig/kpt-setter-config.yaml)

UPSTREAM=upstream
UPSTREAM=./package

.PHONY: download-asmcli
download-asmcli:
Expand All @@ -33,9 +33,9 @@ download-asm-package:
rm -rf asm.tar.gz
curl -LJ https://github.com/GoogleCloudPlatform/anthos-service-mesh-packages/archive/refs/tags/$(ASM_PACKAGE_VERSION).tar.gz -o asm.tar.gz

rm -rf ./package
mkdir package
tar -xf asm.tar.gz --strip-components=1 -C package
rm -rf $(UPSTREAM)
mkdir $(UPSTREAM)
tar -xf asm.tar.gz --strip-components=1 -C $(UPSTREAM)

.PHONY: install-asm
install-asm: download-asmcli download-asm-package
Expand All @@ -46,7 +46,7 @@ install-asm: download-asmcli download-asm-package
--output_dir $(UPSTREAM) \
--enable_all \
--ca mesh_ca \
--custom_overlay ./package/asm/istio/options/iap-operator.yaml \
--custom_overlay $(UPSTREAM)/asm/istio/options/iap-operator.yaml \
--custom_overlay ./options/ingressgateway-iap.yaml \
--option legacy-default-ingressgateway \
--verbose
Expand All @@ -65,14 +65,14 @@ asmcli-validate:
--cluster_location $(LOCATION) \
--output_dir $(UPSTREAM) \
--ca mesh_ca \
--custom_overlay ./package/asm/istio/options/iap-operator.yaml \
--custom_overlay $(UPSTREAM)/asm/istio/options/iap-operator.yaml \
--custom_overlay ./options/ingressgateway-iap.yaml \
--option legacy-default-ingressgateway \
--verbose

.PHONY: asmcli-precheck
asmcli-precheck:
pushd ${UPSTREAM} && ./istioctl experimental precheck && popd
pushd $(UPSTREAM) && ./istioctl experimental precheck && popd
# Note about install gateways
# https://cloud.google.com/service-mesh/docs/unified-install/install#install_gateways

8 changes: 4 additions & 4 deletions kubeflow/common/iap-ingress/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ check-iap:

.PHONY: pod-reset
pod-reset:
kubectl wait deployments/iap-enabler --for=condition=available --timeout=30s
kubectl wait deployments/cloud-endpoints-enabler --for=condition=available --timeout=30s
kubectl rollout status --watch --timeout=30s statefulset/backend-updater
sleep 30
kubectl wait deployments/iap-enabler -n istio-system --for=condition=available --timeout=30s
kubectl wait deployments/cloud-endpoints-enabler -n istio-system --for=condition=available --timeout=30s
kubectl rollout status --watch --timeout=30s -n istio-system statefulset/backend-updater
sleep 90
# Kick the IAP pod because we will reset the policy and need to patch it.
# TODO(https://github.com/kubeflow/gcp-blueprints/issues/14)
kubectl --context=$(KFCTXT) -n istio-system delete deployment iap-enabler
Expand Down
2 changes: 1 addition & 1 deletion kubeflow/common/managed-storage/cloudsql/sql-instance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metadata:
# Other examples to enable private cloudsql or high availability:
# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/tree/master/config-connector/solutions/sql/kpt
spec:
databaseVersion: MYSQL_5_7
databaseVersion: MYSQL_8_0
region: REGION # kpt-set: ${gcloud.compute.region}
settings:
# db-custom-1-3840 means a machine with 1 vCPU and 3840 MBs memory.
Expand Down
4 changes: 2 additions & 2 deletions kubeflow/pull-upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

set -ex

export KUBEFLOW_MANIFESTS_VERSION=v1.6.0
export KUBEFLOW_MANIFESTS_VERSION=v1.6.1
export KUBEFLOW_MANIFESTS_REPO=https://github.com/kubeflow/manifests.git
export KUBEFLOW_PIPELINES_VERSION=2.0.0-alpha.4
export KUBEFLOW_PIPELINES_VERSION=2.0.0-alpha.6
export KUBEFLOW_PIPELINES_REPO=https://github.com/kubeflow/pipelines.git

# Pull Kubeflow Pipelines upstream manifests.
Expand Down

0 comments on commit 1641d19

Please sign in to comment.