diff --git a/CHANGELOG.md b/CHANGELOG.md index 0754ad25..f3535cb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/kubeflow/apps/pipelines/kustomization.yaml b/kubeflow/apps/pipelines/kustomization.yaml index cd96c0b4..d421093c 100644 --- a/kubeflow/apps/pipelines/kustomization.yaml +++ b/kubeflow/apps/pipelines/kustomization.yaml @@ -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 diff --git a/kubeflow/asm/Makefile b/kubeflow/asm/Makefile index 77a56e55..561a0d2c 100644 --- a/kubeflow/asm/Makefile +++ b/kubeflow/asm/Makefile @@ -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 @@ -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: @@ -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 @@ -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 @@ -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 diff --git a/kubeflow/common/iap-ingress/Makefile b/kubeflow/common/iap-ingress/Makefile index d8f07d28..e7ad493f 100644 --- a/kubeflow/common/iap-ingress/Makefile +++ b/kubeflow/common/iap-ingress/Makefile @@ -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 diff --git a/kubeflow/common/managed-storage/cloudsql/sql-instance.yaml b/kubeflow/common/managed-storage/cloudsql/sql-instance.yaml index df954ba6..0062ab2d 100644 --- a/kubeflow/common/managed-storage/cloudsql/sql-instance.yaml +++ b/kubeflow/common/managed-storage/cloudsql/sql-instance.yaml @@ -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. diff --git a/kubeflow/pull-upstream.sh b/kubeflow/pull-upstream.sh index 4d94c597..6d9a72b4 100755 --- a/kubeflow/pull-upstream.sh +++ b/kubeflow/pull-upstream.sh @@ -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.