diff --git a/.github/workflows/kserve_cni_test.yaml b/.github/workflows/kserve_cni_test.yaml index 3ac21b91d5..eb48f8fb34 100644 --- a/.github/workflows/kserve_cni_test.yaml +++ b/.github/workflows/kserve_cni_test.yaml @@ -6,7 +6,7 @@ on: - tests/gh-actions/kind-cluster.yaml - tests/gh-actions/install_kind.sh - tests/gh-actions/install_kustomize.sh - - common/istio-cni-1-17/** + - common/istio-cni-1-22/** - tests/gh-actions/install_cert_manager.sh - common/cert-manager/** - tests/gh-actions/install_knative-cni.sh diff --git a/.github/workflows/notebook_controller_m2m_test.yaml b/.github/workflows/notebook_controller_m2m_test.yaml index fc8f380388..91007f6966 100644 --- a/.github/workflows/notebook_controller_m2m_test.yaml +++ b/.github/workflows/notebook_controller_m2m_test.yaml @@ -32,13 +32,15 @@ jobs: run: ./tests/gh-actions/install_kustomize.sh - name: Create kubeflow namespace - run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - + run: | + kustomize build common/kubeflow-namespace/base | kubectl apply -f - + kustomize build apps/profiles/upstream/overlays/kubeflow | kubectl apply -f - - name: Install Istio with ext auth run: ./tests/gh-actions/install_istio_with_ext_auth.sh* - name: Install kubeflow-istio-resources - run: kustomize build common/istio-1-17/kubeflow-istio-resources/base | kubectl apply -f - + run: kustomize build common/istio-1-22/kubeflow-istio-resources/base | kubectl apply -f - - name: Install KF Multi Tenancy run: ./tests/gh-actions/install_multi_tenancy.sh diff --git a/.github/workflows/pipeline_test.yaml b/.github/workflows/pipeline_test.yaml index f464378645..6e67c139c4 100644 --- a/.github/workflows/pipeline_test.yaml +++ b/.github/workflows/pipeline_test.yaml @@ -33,15 +33,17 @@ jobs: - name: Install kubectl run: ./tests/gh-actions/install_kubectl.sh + - name: Create kubeflow namespace + run: | + kustomize build common/kubeflow-namespace/base | kubectl apply -f - + kustomize build apps/profiles/upstream/overlays/kubeflow | kubectl apply -f - + - name: Install Istio with ext auth run: ./tests/gh-actions/install_istio_with_ext_auth.sh - name: Install cert-manager run: ./tests/gh-actions/install_cert_manager.sh - - name: Create kubeflow namespace - run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - - - name: Install KF Pipelines run: ./tests/gh-actions/install_pipelines.sh @@ -49,7 +51,7 @@ jobs: run: ./tests/gh-actions/install_multi_tenancy.sh - name: Install kubeflow-istio-resources - run: kustomize build common/istio-1-17/kubeflow-istio-resources/base | kubectl apply -f - + run: kustomize build common/istio-1-22/kubeflow-istio-resources/base | kubectl apply -f - - name: Create KF Profile run: kustomize build common/user-namespace/base | kubectl apply -f - diff --git a/README.md b/README.md index fd11ae3097..519c05f1dd 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ used from the different projects of Kubeflow: | Component | Local Manifests Path | Upstream Revision | | - | - | - | -| Istio | common/istio-1-17 | [1.17.3](https://github.com/istio/istio/releases/tag/1.17.3) | +| Istio | common/istio-1-22 | [1.22.0](https://github.com/istio/istio/releases/tag/1.22.0) | | Knative | common/knative/knative-serving
common/knative/knative-eventing | [v1.12.4](https://github.com/knative/serving/releases/tag/knative-v1.12.4)
[v1.12.6](https://github.com/knative/eventing/releases/tag/knative-v1.12.6) | | Cert Manager | common/cert-manager | [1.14.5](https://github.com/cert-manager/cert-manager/releases/tag/v1.12.2) | @@ -208,10 +208,10 @@ Install Istio: ```sh echo "Installing Istio configured with external authorization..." -cd common/istio-1-17 -kustomize build common/istio-1-17/istio-crds/base | kubectl apply -f - -kustomize build common/istio-1-17/istio-namespace/base | kubectl apply -f - -kustomize build common/istio-1-17/istio-install/overlays/oauth2-proxy | kubectl apply -f - +cd common/istio-1-22 +kustomize build common/istio-1-22/istio-crds/base | kubectl apply -f - +kustomize build common/istio-1-22/istio-namespace/base | kubectl apply -f - +kustomize build common/istio-1-22/istio-install/overlays/oauth2-proxy | kubectl apply -f - echo "Waiting for all Istio Pods to become ready..." kubectl wait --for=condition=Ready pods --all -n istio-system --timeout 300s @@ -247,7 +247,7 @@ Install Knative Serving: ```sh kustomize build common/knative/knative-serving/overlays/gateways | kubectl apply -f - -kustomize build common/istio-1-17/cluster-local-gateway/base | kubectl apply -f - +kustomize build common/istio-1-22/cluster-local-gateway/base | kubectl apply -f - ``` Optionally, you can install Knative Eventing which can be used for inference request logging: diff --git a/common/istio-1-17/README.md b/common/istio-1-22/README.md similarity index 100% rename from common/istio-1-17/README.md rename to common/istio-1-22/README.md diff --git a/common/istio-1-17/cluster-local-gateway/base/cluster-local-gateway.yaml b/common/istio-1-22/cluster-local-gateway/base/cluster-local-gateway.yaml similarity index 99% rename from common/istio-1-17/cluster-local-gateway/base/cluster-local-gateway.yaml rename to common/istio-1-22/cluster-local-gateway/base/cluster-local-gateway.yaml index 20ecc30f15..dc6d1c270b 100644 --- a/common/istio-1-17/cluster-local-gateway/base/cluster-local-gateway.yaml +++ b/common/istio-1-22/cluster-local-gateway/base/cluster-local-gateway.yaml @@ -120,7 +120,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: docker.io/istio/proxyv2:1.17.5 + image: docker.io/istio/proxyv2:1.22.0 name: istio-proxy ports: - containerPort: 15020 diff --git a/common/istio-1-17/cluster-local-gateway/base/gateway-authorizationpolicy.yaml b/common/istio-1-22/cluster-local-gateway/base/gateway-authorizationpolicy.yaml similarity index 100% rename from common/istio-1-17/cluster-local-gateway/base/gateway-authorizationpolicy.yaml rename to common/istio-1-22/cluster-local-gateway/base/gateway-authorizationpolicy.yaml diff --git a/common/istio-1-17/cluster-local-gateway/base/gateway.yaml b/common/istio-1-22/cluster-local-gateway/base/gateway.yaml similarity index 100% rename from common/istio-1-17/cluster-local-gateway/base/gateway.yaml rename to common/istio-1-22/cluster-local-gateway/base/gateway.yaml diff --git a/common/istio-1-17/cluster-local-gateway/base/kustomization.yaml b/common/istio-1-22/cluster-local-gateway/base/kustomization.yaml similarity index 100% rename from common/istio-1-17/cluster-local-gateway/base/kustomization.yaml rename to common/istio-1-22/cluster-local-gateway/base/kustomization.yaml diff --git a/common/istio-1-17/cluster-local-gateway/base/patches/remove-pdb.yaml b/common/istio-1-22/cluster-local-gateway/base/patches/remove-pdb.yaml similarity index 100% rename from common/istio-1-17/cluster-local-gateway/base/patches/remove-pdb.yaml rename to common/istio-1-22/cluster-local-gateway/base/patches/remove-pdb.yaml diff --git a/common/istio-1-17/istio-crds/base/crd.yaml b/common/istio-1-22/istio-crds/base/crd.yaml similarity index 100% rename from common/istio-1-17/istio-crds/base/crd.yaml rename to common/istio-1-22/istio-crds/base/crd.yaml diff --git a/common/istio-1-17/istio-crds/base/kustomization.yaml b/common/istio-1-22/istio-crds/base/kustomization.yaml similarity index 100% rename from common/istio-1-17/istio-crds/base/kustomization.yaml rename to common/istio-1-22/istio-crds/base/kustomization.yaml diff --git a/common/istio-1-17/istio-install/base/deny_all_authorizationpolicy.yaml b/common/istio-1-22/istio-install/base/deny_all_authorizationpolicy.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/deny_all_authorizationpolicy.yaml rename to common/istio-1-22/istio-install/base/deny_all_authorizationpolicy.yaml diff --git a/common/istio-1-17/istio-install/base/gateway.yaml b/common/istio-1-22/istio-install/base/gateway.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/gateway.yaml rename to common/istio-1-22/istio-install/base/gateway.yaml diff --git a/common/istio-1-17/istio-install/base/gateway_authorizationpolicy.yaml b/common/istio-1-22/istio-install/base/gateway_authorizationpolicy.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/gateway_authorizationpolicy.yaml rename to common/istio-1-22/istio-install/base/gateway_authorizationpolicy.yaml diff --git a/common/istio-1-17/istio-install/base/install.yaml b/common/istio-1-22/istio-install/base/install.yaml similarity index 99% rename from common/istio-1-17/istio-install/base/install.yaml rename to common/istio-1-22/istio-install/base/install.yaml index 33113c1620..da1d2a9c55 100644 --- a/common/istio-1-17/istio-install/base/install.yaml +++ b/common/istio-1-22/istio-install/base/install.yaml @@ -1647,7 +1647,7 @@ data: "sts": { "servicePort": 0 }, - "tag": "1.17.5", + "tag": "1.22.0", "tracer": { "datadog": { "address": "$(HOST_IP):8126" @@ -3011,7 +3011,7 @@ spec: serviceAccountName: istio-ingressgateway-service-account containers: - name: istio-proxy - image: docker.io/istio/proxyv2:1.17.5 + image: docker.io/istio/proxyv2:1.22.0 ports: - containerPort: 15021 protocol: TCP @@ -3219,7 +3219,7 @@ spec: fsGroup: 1337 containers: - name: discovery - image: docker.io/istio/pilot:1.17.5 + image: docker.io/istio/pilot:1.22.0 args: - discovery - --monitoringAddr=:15014 diff --git a/common/istio-1-17/istio-install/base/kustomization.yaml b/common/istio-1-22/istio-install/base/kustomization.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/kustomization.yaml rename to common/istio-1-22/istio-install/base/kustomization.yaml diff --git a/common/istio-1-17/istio-install/base/patches/disable-debugging.yaml b/common/istio-1-22/istio-install/base/patches/disable-debugging.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/patches/disable-debugging.yaml rename to common/istio-1-22/istio-install/base/patches/disable-debugging.yaml diff --git a/common/istio-1-17/istio-install/base/patches/istio-configmap-disable-tracing.yaml b/common/istio-1-22/istio-install/base/patches/istio-configmap-disable-tracing.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/patches/istio-configmap-disable-tracing.yaml rename to common/istio-1-22/istio-install/base/patches/istio-configmap-disable-tracing.yaml diff --git a/common/istio-1-17/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml b/common/istio-1-22/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml rename to common/istio-1-22/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml diff --git a/common/istio-1-17/istio-install/base/patches/istiod-remove-pdb.yaml b/common/istio-1-22/istio-install/base/patches/istiod-remove-pdb.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/patches/istiod-remove-pdb.yaml rename to common/istio-1-22/istio-install/base/patches/istiod-remove-pdb.yaml diff --git a/common/istio-1-17/istio-install/base/patches/service.yaml b/common/istio-1-22/istio-install/base/patches/service.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/patches/service.yaml rename to common/istio-1-22/istio-install/base/patches/service.yaml diff --git a/common/istio-1-17/istio-install/base/x-forwarded-host.yaml b/common/istio-1-22/istio-install/base/x-forwarded-host.yaml similarity index 100% rename from common/istio-1-17/istio-install/base/x-forwarded-host.yaml rename to common/istio-1-22/istio-install/base/x-forwarded-host.yaml diff --git a/common/istio-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml b/common/istio-1-22/istio-install/overlays/oauth2-proxy/kustomization.yaml similarity index 100% rename from common/istio-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml rename to common/istio-1-22/istio-install/overlays/oauth2-proxy/kustomization.yaml diff --git a/common/istio-1-17/istio-namespace/base/kustomization.yaml b/common/istio-1-22/istio-namespace/base/kustomization.yaml similarity index 100% rename from common/istio-1-17/istio-namespace/base/kustomization.yaml rename to common/istio-1-22/istio-namespace/base/kustomization.yaml diff --git a/common/istio-1-17/istio-namespace/base/namespace.yaml b/common/istio-1-22/istio-namespace/base/namespace.yaml similarity index 100% rename from common/istio-1-17/istio-namespace/base/namespace.yaml rename to common/istio-1-22/istio-namespace/base/namespace.yaml diff --git a/common/istio-1-17/kubeflow-istio-resources/base/cluster-roles.yaml b/common/istio-1-22/kubeflow-istio-resources/base/cluster-roles.yaml similarity index 100% rename from common/istio-1-17/kubeflow-istio-resources/base/cluster-roles.yaml rename to common/istio-1-22/kubeflow-istio-resources/base/cluster-roles.yaml diff --git a/common/istio-1-17/kubeflow-istio-resources/base/kf-istio-resources.yaml b/common/istio-1-22/kubeflow-istio-resources/base/kf-istio-resources.yaml similarity index 100% rename from common/istio-1-17/kubeflow-istio-resources/base/kf-istio-resources.yaml rename to common/istio-1-22/kubeflow-istio-resources/base/kf-istio-resources.yaml diff --git a/common/istio-1-17/kubeflow-istio-resources/base/kustomization.yaml b/common/istio-1-22/kubeflow-istio-resources/base/kustomization.yaml similarity index 100% rename from common/istio-1-17/kubeflow-istio-resources/base/kustomization.yaml rename to common/istio-1-22/kubeflow-istio-resources/base/kustomization.yaml diff --git a/common/istio-1-17/profile-overlay.yaml b/common/istio-1-22/profile-overlay.yaml similarity index 100% rename from common/istio-1-17/profile-overlay.yaml rename to common/istio-1-22/profile-overlay.yaml diff --git a/common/istio-cni-1-17/profile.yaml b/common/istio-1-22/profile.yaml similarity index 99% rename from common/istio-cni-1-17/profile.yaml rename to common/istio-1-22/profile.yaml index 9621a5596c..dedd3c1d05 100644 --- a/common/istio-cni-1-17/profile.yaml +++ b/common/istio-1-22/profile.yaml @@ -22,7 +22,7 @@ spec: proxyMetadata: {} enablePrometheusMerge: true profile: default - tag: 1.17.5 + tag: 1.22.0 values: base: enableCRDTemplates: false diff --git a/common/istio-1-17/split-istio-packages b/common/istio-1-22/split-istio-packages similarity index 100% rename from common/istio-1-17/split-istio-packages rename to common/istio-1-22/split-istio-packages diff --git a/common/istio-cni-1-17/README.md b/common/istio-cni-1-22/README.md similarity index 100% rename from common/istio-cni-1-17/README.md rename to common/istio-cni-1-22/README.md diff --git a/common/istio-cni-1-17/cluster-local-gateway/base/cluster-local-gateway.yaml b/common/istio-cni-1-22/cluster-local-gateway/base/cluster-local-gateway.yaml similarity index 99% rename from common/istio-cni-1-17/cluster-local-gateway/base/cluster-local-gateway.yaml rename to common/istio-cni-1-22/cluster-local-gateway/base/cluster-local-gateway.yaml index 20ecc30f15..dc6d1c270b 100644 --- a/common/istio-cni-1-17/cluster-local-gateway/base/cluster-local-gateway.yaml +++ b/common/istio-cni-1-22/cluster-local-gateway/base/cluster-local-gateway.yaml @@ -120,7 +120,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: docker.io/istio/proxyv2:1.17.5 + image: docker.io/istio/proxyv2:1.22.0 name: istio-proxy ports: - containerPort: 15020 diff --git a/common/istio-cni-1-17/cluster-local-gateway/base/gateway-authorizationpolicy.yaml b/common/istio-cni-1-22/cluster-local-gateway/base/gateway-authorizationpolicy.yaml similarity index 100% rename from common/istio-cni-1-17/cluster-local-gateway/base/gateway-authorizationpolicy.yaml rename to common/istio-cni-1-22/cluster-local-gateway/base/gateway-authorizationpolicy.yaml diff --git a/common/istio-cni-1-17/cluster-local-gateway/base/gateway.yaml b/common/istio-cni-1-22/cluster-local-gateway/base/gateway.yaml similarity index 100% rename from common/istio-cni-1-17/cluster-local-gateway/base/gateway.yaml rename to common/istio-cni-1-22/cluster-local-gateway/base/gateway.yaml diff --git a/common/istio-cni-1-17/cluster-local-gateway/base/kustomization.yaml b/common/istio-cni-1-22/cluster-local-gateway/base/kustomization.yaml similarity index 100% rename from common/istio-cni-1-17/cluster-local-gateway/base/kustomization.yaml rename to common/istio-cni-1-22/cluster-local-gateway/base/kustomization.yaml diff --git a/common/istio-cni-1-17/cluster-local-gateway/base/patches/remove-pdb.yaml b/common/istio-cni-1-22/cluster-local-gateway/base/patches/remove-pdb.yaml similarity index 100% rename from common/istio-cni-1-17/cluster-local-gateway/base/patches/remove-pdb.yaml rename to common/istio-cni-1-22/cluster-local-gateway/base/patches/remove-pdb.yaml diff --git a/common/istio-cni-1-17/istio-crds/base/crd.yaml b/common/istio-cni-1-22/istio-crds/base/crd.yaml similarity index 100% rename from common/istio-cni-1-17/istio-crds/base/crd.yaml rename to common/istio-cni-1-22/istio-crds/base/crd.yaml diff --git a/common/istio-cni-1-17/istio-crds/base/kustomization.yaml b/common/istio-cni-1-22/istio-crds/base/kustomization.yaml similarity index 100% rename from common/istio-cni-1-17/istio-crds/base/kustomization.yaml rename to common/istio-cni-1-22/istio-crds/base/kustomization.yaml diff --git a/common/istio-cni-1-17/istio-install/base/deny_all_authorizationpolicy.yaml b/common/istio-cni-1-22/istio-install/base/deny_all_authorizationpolicy.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/deny_all_authorizationpolicy.yaml rename to common/istio-cni-1-22/istio-install/base/deny_all_authorizationpolicy.yaml diff --git a/common/istio-cni-1-17/istio-install/base/gateway.yaml b/common/istio-cni-1-22/istio-install/base/gateway.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/gateway.yaml rename to common/istio-cni-1-22/istio-install/base/gateway.yaml diff --git a/common/istio-cni-1-17/istio-install/base/gateway_authorizationpolicy.yaml b/common/istio-cni-1-22/istio-install/base/gateway_authorizationpolicy.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/gateway_authorizationpolicy.yaml rename to common/istio-cni-1-22/istio-install/base/gateway_authorizationpolicy.yaml diff --git a/common/istio-cni-1-17/istio-install/base/install.yaml b/common/istio-cni-1-22/istio-install/base/install.yaml similarity index 99% rename from common/istio-cni-1-17/istio-install/base/install.yaml rename to common/istio-cni-1-22/istio-install/base/install.yaml index c5fe6e1ade..f4fa8a87d3 100644 --- a/common/istio-cni-1-17/istio-install/base/install.yaml +++ b/common/istio-cni-1-22/istio-install/base/install.yaml @@ -1760,7 +1760,7 @@ data: "sts": { "servicePort": 0 }, - "tag": "1.17.5", + "tag": "1.22.0", "tracer": { "datadog": { "address": "$(HOST_IP):8126" @@ -3127,7 +3127,7 @@ spec: # This container installs the Istio CNI binaries # and CNI network config file on each node. - name: install-cni - image: docker.io/istio/install-cni:1.17.5 + image: docker.io/istio/install-cni:1.22.0 readinessProbe: httpGet: path: /readyz @@ -3246,7 +3246,7 @@ spec: serviceAccountName: istio-ingressgateway-service-account containers: - name: istio-proxy - image: docker.io/istio/proxyv2:1.17.5 + image: docker.io/istio/proxyv2:1.22.0 ports: - containerPort: 15021 protocol: TCP @@ -3454,7 +3454,7 @@ spec: fsGroup: 1337 containers: - name: discovery - image: docker.io/istio/pilot:1.17.5 + image: docker.io/istio/pilot:1.22.0 args: - discovery - --monitoringAddr=:15014 diff --git a/common/istio-cni-1-17/istio-install/base/kustomization.yaml b/common/istio-cni-1-22/istio-install/base/kustomization.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/kustomization.yaml rename to common/istio-cni-1-22/istio-install/base/kustomization.yaml diff --git a/common/istio-cni-1-17/istio-install/base/patches/disable-debugging.yaml b/common/istio-cni-1-22/istio-install/base/patches/disable-debugging.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/patches/disable-debugging.yaml rename to common/istio-cni-1-22/istio-install/base/patches/disable-debugging.yaml diff --git a/common/istio-cni-1-17/istio-install/base/patches/istio-configmap-disable-tracing.yaml b/common/istio-cni-1-22/istio-install/base/patches/istio-configmap-disable-tracing.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/patches/istio-configmap-disable-tracing.yaml rename to common/istio-cni-1-22/istio-install/base/patches/istio-configmap-disable-tracing.yaml diff --git a/common/istio-cni-1-17/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml b/common/istio-cni-1-22/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml rename to common/istio-cni-1-22/istio-install/base/patches/istio-ingressgateway-remove-pdb.yaml diff --git a/common/istio-cni-1-17/istio-install/base/patches/istiod-remove-pdb.yaml b/common/istio-cni-1-22/istio-install/base/patches/istiod-remove-pdb.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/patches/istiod-remove-pdb.yaml rename to common/istio-cni-1-22/istio-install/base/patches/istiod-remove-pdb.yaml diff --git a/common/istio-cni-1-17/istio-install/base/patches/service.yaml b/common/istio-cni-1-22/istio-install/base/patches/service.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/patches/service.yaml rename to common/istio-cni-1-22/istio-install/base/patches/service.yaml diff --git a/common/istio-cni-1-17/istio-install/base/x-forwarded-host.yaml b/common/istio-cni-1-22/istio-install/base/x-forwarded-host.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/base/x-forwarded-host.yaml rename to common/istio-cni-1-22/istio-install/base/x-forwarded-host.yaml diff --git a/common/istio-cni-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml b/common/istio-cni-1-22/istio-install/overlays/oauth2-proxy/kustomization.yaml similarity index 100% rename from common/istio-cni-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml rename to common/istio-cni-1-22/istio-install/overlays/oauth2-proxy/kustomization.yaml diff --git a/common/istio-cni-1-17/istio-namespace/base/kustomization.yaml b/common/istio-cni-1-22/istio-namespace/base/kustomization.yaml similarity index 100% rename from common/istio-cni-1-17/istio-namespace/base/kustomization.yaml rename to common/istio-cni-1-22/istio-namespace/base/kustomization.yaml diff --git a/common/istio-cni-1-17/istio-namespace/base/namespace.yaml b/common/istio-cni-1-22/istio-namespace/base/namespace.yaml similarity index 100% rename from common/istio-cni-1-17/istio-namespace/base/namespace.yaml rename to common/istio-cni-1-22/istio-namespace/base/namespace.yaml diff --git a/common/istio-cni-1-17/kubeflow-istio-resources/base/cluster-roles.yaml b/common/istio-cni-1-22/kubeflow-istio-resources/base/cluster-roles.yaml similarity index 100% rename from common/istio-cni-1-17/kubeflow-istio-resources/base/cluster-roles.yaml rename to common/istio-cni-1-22/kubeflow-istio-resources/base/cluster-roles.yaml diff --git a/common/istio-cni-1-17/kubeflow-istio-resources/base/kf-istio-resources.yaml b/common/istio-cni-1-22/kubeflow-istio-resources/base/kf-istio-resources.yaml similarity index 100% rename from common/istio-cni-1-17/kubeflow-istio-resources/base/kf-istio-resources.yaml rename to common/istio-cni-1-22/kubeflow-istio-resources/base/kf-istio-resources.yaml diff --git a/common/istio-cni-1-17/kubeflow-istio-resources/base/kustomization.yaml b/common/istio-cni-1-22/kubeflow-istio-resources/base/kustomization.yaml similarity index 100% rename from common/istio-cni-1-17/kubeflow-istio-resources/base/kustomization.yaml rename to common/istio-cni-1-22/kubeflow-istio-resources/base/kustomization.yaml diff --git a/common/istio-cni-1-17/profile-overlay.yaml b/common/istio-cni-1-22/profile-overlay.yaml similarity index 100% rename from common/istio-cni-1-17/profile-overlay.yaml rename to common/istio-cni-1-22/profile-overlay.yaml diff --git a/common/istio-1-17/profile.yaml b/common/istio-cni-1-22/profile.yaml similarity index 99% rename from common/istio-1-17/profile.yaml rename to common/istio-cni-1-22/profile.yaml index 9621a5596c..dedd3c1d05 100644 --- a/common/istio-1-17/profile.yaml +++ b/common/istio-cni-1-22/profile.yaml @@ -22,7 +22,7 @@ spec: proxyMetadata: {} enablePrometheusMerge: true profile: default - tag: 1.17.5 + tag: 1.22.0 values: base: enableCRDTemplates: false diff --git a/common/istio-cni-1-17/split-istio-packages b/common/istio-cni-1-22/split-istio-packages similarity index 100% rename from common/istio-cni-1-17/split-istio-packages rename to common/istio-cni-1-22/split-istio-packages diff --git a/common/oidc-client/oauth2-proxy/README.md b/common/oidc-client/oauth2-proxy/README.md index f3699bce7e..caa0aab16f 100644 --- a/common/oidc-client/oauth2-proxy/README.md +++ b/common/oidc-client/oauth2-proxy/README.md @@ -169,9 +169,9 @@ make the following changes to the `example/kustomization.yaml` file: * use `oauth2-proxy` overlay for istio-install ``` # from - - ../common/istio-1-17/istio-install/base + - ../common/istio-1-22/istio-install/base # to - - ../common/istio-1-17/istio-install/overlays/oauth2-proxy + - ../common/istio-1-22/istio-install/overlays/oauth2-proxy ``` * change `OIDC Authservice` to `oauth2-proxy for OIDC` and use overlay for m2m bearer tokens with self-signed in-cluster issuer @@ -204,12 +204,12 @@ index c1a85789..4a50440c 100644 +++ b/example/kustomization.yaml @@ -38,11 +38,11 @@ resources: # Istio - - ../common/istio-1-17/istio-crds/base - - ../common/istio-1-17/istio-namespace/base --- ../common/istio-1-17/istio-install/base + - ../common/istio-1-22/istio-crds/base + - ../common/istio-1-22/istio-namespace/base +-- ../common/istio-1-22/istio-install/base -# OIDC Authservice -- ../common/oidc-client/oidc-authservice/base -+- ../common/istio-1-17/istio-install/overlays/oauth2-proxy ++- ../common/istio-1-22/istio-install/overlays/oauth2-proxy +# oauth2-proxy for OIDC +- ../common/oidc-client/oauth2-proxy/overlays/m2m-self-signed # Dex diff --git a/contrib/kserve/README.md b/contrib/kserve/README.md index 4eea52736b..671dd70733 100644 --- a/contrib/kserve/README.md +++ b/contrib/kserve/README.md @@ -61,15 +61,15 @@ For upgrading see [UPGRADE.md](UPGRADE.md) ``` 5. Install Istio ```sh - kubectl apply -k ../../common/istio-1-17/istio-crds/base - kubectl apply -k ../../common/istio-1-17/istio-namespace/base - kubectl apply -k ../../common/istio-1-17/istio-install/base + kubectl apply -k ../../common/istio-1-22/istio-crds/base + kubectl apply -k ../../common/istio-1-22/istio-namespace/base + kubectl apply -k ../../common/istio-1-22/istio-install/base ``` 6. Install knative ```sh kubectl apply -k ../../common/knative/knative-serving/overlays/gateways - kubectl apply -k ../../common/istio-1-17/cluster-local-gateway/base - kubectl apply -k ../../common/istio-1-17/kubeflow-istio-resources/base + kubectl apply -k ../../common/istio-1-22/cluster-local-gateway/base + kubectl apply -k ../../common/istio-1-22/kubeflow-istio-resources/base ``` 7. Install kserve ```sh diff --git a/example/kustomization.yaml b/example/kustomization.yaml index c00819031d..ade0a14c65 100644 --- a/example/kustomization.yaml +++ b/example/kustomization.yaml @@ -37,9 +37,9 @@ resources: - ../common/cert-manager/cert-manager/base - ../common/cert-manager/kubeflow-issuer/base # Istio -- ../common/istio-1-17/istio-crds/base -- ../common/istio-1-17/istio-namespace/base -- ../common/istio-1-17/istio-install/overlays/oauth2-proxy +- ../common/istio-1-22/istio-crds/base +- ../common/istio-1-22/istio-namespace/base +- ../common/istio-1-22/istio-install/overlays/oauth2-proxy # oauth2-proxy - ../common/oidc-client/oauth2-proxy/overlays/m2m-self-signed # Dex @@ -47,7 +47,7 @@ resources: # KNative - ../common/knative/knative-serving/overlays/gateways - ../common/knative/knative-eventing/base -- ../common/istio-1-17/cluster-local-gateway/base +- ../common/istio-1-22/cluster-local-gateway/base # Kubeflow namespace - ../common/kubeflow-namespace/base # NetworkPolicies @@ -55,7 +55,7 @@ resources: # Kubeflow Roles - ../common/kubeflow-roles/base # Kubeflow Istio Resources -- ../common/istio-1-17/kubeflow-istio-resources/base +- ../common/istio-1-22/kubeflow-istio-resources/base # Kubeflow Pipelines diff --git a/hack/extract_images.sh b/hack/extract_images.sh index 5db55390b9..8b65609f3e 100755 --- a/hack/extract_images.sh +++ b/hack/extract_images.sh @@ -15,7 +15,7 @@ declare -A wg_dirs=( [automl]="../apps/katib/upstream/installs" [pipelines]="../apps/pipeline/upstream/env ../apps/kfp-tekton/upstream/env" [training]="../apps/training-operator/upstream/overlays" - [manifests]="../common/cert-manager/cert-manager/base ../common/cert-manager/kubeflow-issuer/base ../common/istio-1-17/istio-crds/base ../common/istio-1-17/istio-namespace/base ../common/istio-1-17/istio-install/overlays/oauth2-proxy ../common/oidc-client/oauth2-proxy/overlays/m2m-self-signed ../common/dex/overlays/oauth2-proxy ../common/knative/knative-serving/overlays/gateways ../common/knative/knative-eventing/base ../common/istio-1-17/cluster-local-gateway/base ../common/kubeflow-namespace/base ../common/kubeflow-roles/base ../common/istio-1-17/kubeflow-istio-resources/base" + [manifests]="../common/cert-manager/cert-manager/base ../common/cert-manager/kubeflow-issuer/base ../common/istio-1-22/istio-crds/base ../common/istio-1-22/istio-namespace/base ../common/istio-1-22/istio-install/overlays/oauth2-proxy ../common/oidc-client/oauth2-proxy/overlays/m2m-self-signed ../common/dex/overlays/oauth2-proxy ../common/knative/knative-serving/overlays/gateways ../common/knative/knative-eventing/base ../common/istio-1-22/cluster-local-gateway/base ../common/kubeflow-namespace/base ../common/kubeflow-roles/base ../common/istio-1-22/kubeflow-istio-resources/base" [workbenches]="../apps/pvcviewer-controller/upstream/base ../apps/admission-webhook/upstream/overlays ../apps/centraldashboard/upstream/overlays/oauth2-proxy ../apps/jupyter/jupyter-web-app/upstream/overlays ../apps/volumes-web-app/upstream/overlays ../apps/tensorboard/tensorboards-web-app/upstream/overlays ../apps/profiles/upstream/overlays ../apps/jupyter/notebook-controller/upstream/overlays ../apps/tensorboard/tensorboard-controller/upstream/overlays" [serving]="../contrib/kserve - ../contrib/kserve/models-web-app/overlays/kubeflow" [model-registry]="../apps/model-registry/upstream" diff --git a/tests/gh-actions/install_istio-cni.sh b/tests/gh-actions/install_istio-cni.sh index 05b2d0ab0a..6c6925ffb4 100755 --- a/tests/gh-actions/install_istio-cni.sh +++ b/tests/gh-actions/install_istio-cni.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e echo "Installing Istio-cni ..." -cd common/istio-cni-1-17 +cd common/istio-cni-1-22 kustomize build istio-crds/base | kubectl apply -f - kustomize build istio-namespace/base | kubectl apply -f - kustomize build istio-install/base | kubectl apply -f - \ No newline at end of file diff --git a/tests/gh-actions/install_istio.sh b/tests/gh-actions/install_istio.sh index eb01319b43..6fa6cab23b 100755 --- a/tests/gh-actions/install_istio.sh +++ b/tests/gh-actions/install_istio.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e echo "Installing Istio ..." -cd common/istio-1-17 +cd common/istio-1-22 kustomize build istio-crds/base | kubectl apply -f - kustomize build istio-namespace/base | kubectl apply -f - kustomize build istio-install/base | kubectl apply -f - diff --git a/tests/gh-actions/install_istio_with_ext_auth.sh b/tests/gh-actions/install_istio_with_ext_auth.sh index bb991d354b..ee6b56e513 100755 --- a/tests/gh-actions/install_istio_with_ext_auth.sh +++ b/tests/gh-actions/install_istio_with_ext_auth.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e echo "Installing Istio configured with external authorization..." -cd common/istio-1-17 +cd common/istio-1-22 kustomize build istio-crds/base | kubectl apply -f - kustomize build istio-namespace/base | kubectl apply -f - kustomize build istio-install/overlays/oauth2-proxy | kubectl apply -f - diff --git a/tests/gh-actions/install_knative-cni.sh b/tests/gh-actions/install_knative-cni.sh index 4381f0a000..b831502bf1 100755 --- a/tests/gh-actions/install_knative-cni.sh +++ b/tests/gh-actions/install_knative-cni.sh @@ -6,8 +6,8 @@ kustomize build common/knative/knative-serving/base | kubectl apply -f - set -e kustomize build common/knative/knative-serving/base | kubectl apply -f - -kustomize build common/istio-cni-1-17/cluster-local-gateway/base | kubectl apply -f - -kustomize build common/istio-cni-1-17/kubeflow-istio-resources/base | kubectl apply -f - +kustomize build common/istio-cni-1-22/cluster-local-gateway/base | kubectl apply -f - +kustomize build common/istio-cni-1-22/kubeflow-istio-resources/base | kubectl apply -f - kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout 600s kubectl patch cm config-domain --patch '{"data":{"example.com":""}}' -n knative-serving diff --git a/tests/gh-actions/install_knative.sh b/tests/gh-actions/install_knative.sh index cf409a64c9..832ee13531 100755 --- a/tests/gh-actions/install_knative.sh +++ b/tests/gh-actions/install_knative.sh @@ -6,8 +6,8 @@ kustomize build common/knative/knative-serving/base | kubectl apply -f - set -e kustomize build common/knative/knative-serving/base | kubectl apply -f - -kustomize build common/istio-1-17/cluster-local-gateway/base | kubectl apply -f - -kustomize build common/istio-1-17/kubeflow-istio-resources/base | kubectl apply -f - +kustomize build common/istio-1-22/cluster-local-gateway/base | kubectl apply -f - +kustomize build common/istio-1-22/kubeflow-istio-resources/base | kubectl apply -f - kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout 600s kubectl patch cm config-domain --patch '{"data":{"example.com":""}}' -n knative-serving