diff --git a/.github/workflows/admission_webhook_test.yaml b/.github/workflows/admission_webhook_test.yaml index fecfb8b5e5..4ff9da9f8b 100644 --- a/.github/workflows/admission_webhook_test.yaml +++ b/.github/workflows/admission_webhook_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/admission_webhook_test.yaml - apps/admission-webhook/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - tests/gh-actions/install_cert_manager.sh - common/cert-manager/** @@ -20,7 +20,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install cert-manager run: ./tests/gh-actions/install_cert_manager.sh diff --git a/.github/workflows/centraldashboard_test.yaml b/.github/workflows/centraldashboard_test.yaml index 4ec4c0baf7..1726f8e258 100644 --- a/.github/workflows/centraldashboard_test.yaml +++ b/.github/workflows/centraldashboard_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/centraldashboard_test.yaml - apps/centraldashboard/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh jobs: build: @@ -18,7 +18,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Build & Apply manifests run: | diff --git a/.github/workflows/dex_test.yaml b/.github/workflows/dex_test.yaml index 8a9be13475..1edcf84856 100644 --- a/.github/workflows/dex_test.yaml +++ b/.github/workflows/dex_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/dex_test.yaml - common/dex/base/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh jobs: build: diff --git a/.github/workflows/jupyter_web_application_test.yaml b/.github/workflows/jupyter_web_application_test.yaml index f1054d15bb..85a93f1bb2 100644 --- a/.github/workflows/jupyter_web_application_test.yaml +++ b/.github/workflows/jupyter_web_application_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/jupyter_web_application_test.yaml - apps/jupyter/jupyter-web-app/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh jobs: build: @@ -18,7 +18,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Build & Apply manifests run: | diff --git a/.github/workflows/katib_test.yaml b/.github/workflows/katib_test.yaml index 973fa15588..a59f4c8209 100644 --- a/.github/workflows/katib_test.yaml +++ b/.github/workflows/katib_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/katib_test.yaml - apps/katib/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - tests/gh-actions/install_cert_manager.sh - common/cert-manager/** @@ -20,7 +20,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install cert-manager run: ./tests/gh-actions/install_cert_manager.sh diff --git a/.github/workflows/kserve_cni_test.yaml b/.github/workflows/kserve_cni_test.yaml deleted file mode 100644 index fb12597932..0000000000 --- a/.github/workflows/kserve_cni_test.yaml +++ /dev/null @@ -1,62 +0,0 @@ -name: Build & Apply KServe manifests in KinD, using istio CNI -on: - pull_request: - paths: - - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - - .github/workflows/kserve_cni_test.yaml - - common/istio-cni-1-23/** - - tests/gh-actions/install_cert_manager.sh - - common/cert-manager/** - - tests/gh-actions/install_knative-cni.sh - - common/knative/** - - tests/gh-actions/install_kserve.sh - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install KinD, Create KinD cluster and Install kustomize - run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - - - name: Create kubeflow namespace - run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - - - - name: Install Istio CNI - run: ./tests/gh-actions/install_istio-cni.sh - - - name: Install cert-manager - run: ./tests/gh-actions/install_cert_manager.sh - - - name: Install knative CNI - run: ./tests/gh-actions/install_knative-cni.sh - - - name: Build & Apply manifests - run: ./tests/gh-actions/install_kserve.sh - - - name: Create test namespace - run: kubectl create ns kserve-test - - - name: Setup python 3.9 - uses: actions/setup-python@v4 - with: - python-version: 3.9 - - - name: Install test dependencies - run: pip install -r ./contrib/kserve/tests/requirements.txt - - - name: Port forward - run: | - INGRESS_GATEWAY_SERVICE=$(kubectl get svc --namespace istio-system --selector="app=istio-ingressgateway" --output jsonpath='{.items[0].metadata.name}') - nohup kubectl port-forward --namespace istio-system svc/${INGRESS_GATEWAY_SERVICE} 8080:80 & - - - name: Run kserve tests - run: | - export KSERVE_INGRESS_HOST_PORT=localhost:8080 - cd ./contrib/kserve/tests && pytest . - - - name: Run kserve models webapp test - run: | - kubectl wait --for=condition=Available --timeout=300s -n kubeflow deployment/kserve-models-web-app diff --git a/.github/workflows/kserve_m2m_test.yaml b/.github/workflows/kserve_m2m_test.yaml index 86e77f58c5..2b9eb73383 100644 --- a/.github/workflows/kserve_m2m_test.yaml +++ b/.github/workflows/kserve_m2m_test.yaml @@ -7,7 +7,7 @@ on: - contrib/kserve/** - common/oauth2-proxy/** - common/istio*/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - tests/gh-actions/install_oauth2-proxy.sh - tests/gh-actions/install_cert_manager.sh - common/cert-manager/** @@ -32,7 +32,7 @@ jobs: run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh diff --git a/.github/workflows/kserve_test.yaml b/.github/workflows/kserve_test.yaml index 0a01979c74..675c279949 100644 --- a/.github/workflows/kserve_test.yaml +++ b/.github/workflows/kserve_test.yaml @@ -25,7 +25,7 @@ jobs: run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install cert-manager run: ./tests/gh-actions/install_cert_manager.sh diff --git a/.github/workflows/model_registry_test.yaml b/.github/workflows/model_registry_test.yaml index 79d23ac224..de2894390e 100644 --- a/.github/workflows/model_registry_test.yaml +++ b/.github/workflows/model_registry_test.yaml @@ -6,7 +6,7 @@ on: paths: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - apps/model-registry/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - common/istio*/** jobs: @@ -26,7 +26,7 @@ jobs: run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh diff --git a/.github/workflows/notebook_controller_m2m_test.yaml b/.github/workflows/notebook_controller_m2m_test.yaml index cb70027de1..562111b0fd 100644 --- a/.github/workflows/notebook_controller_m2m_test.yaml +++ b/.github/workflows/notebook_controller_m2m_test.yaml @@ -7,7 +7,7 @@ on: - apps/jupyter/** - common/oauth2-proxy/** - common/istio*/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - tests/gh-actions/install_oauth2-proxy.sh - tests/gh-actions/install_multi_tenancy.sh @@ -28,13 +28,13 @@ jobs: run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh - name: Install kubeflow-istio-resources - run: kustomize build common/istio-1-23/kubeflow-istio-resources/base | kubectl apply -f - + run: kustomize build common/istio-cni-1-23/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/notebook_controller_test.yaml b/.github/workflows/notebook_controller_test.yaml index 31bba95793..02f6031085 100644 --- a/.github/workflows/notebook_controller_test.yaml +++ b/.github/workflows/notebook_controller_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/notebook_controller_test.yaml - apps/jupyter/notebook-controller/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - common/istio*/** jobs: @@ -19,7 +19,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Build & Apply manifests run: | diff --git a/.github/workflows/pipeline_run_from_notebook.yaml b/.github/workflows/pipeline_run_from_notebook.yaml index 3f1aee3914..e95b21387d 100644 --- a/.github/workflows/pipeline_run_from_notebook.yaml +++ b/.github/workflows/pipeline_run_from_notebook.yaml @@ -6,7 +6,7 @@ on: - .github/workflows/pipeline_run_from_notebook.yaml - apps/jupyter/notebook-controller/upstream/** - apps/pipeline/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - tests/gh-actions/install_cert_manager.sh - common/cert-manager/** - common/oauth2-proxy/** @@ -25,7 +25,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh @@ -37,7 +37,7 @@ jobs: run: kustomize build common/kubeflow-namespace/base | kubectl apply -f - - name: Install kubeflow-istio-resources - run: kustomize build common/istio-1-23/kubeflow-istio-resources/base | kubectl apply -f - + run: kustomize build common/istio-cni-1-23/kubeflow-istio-resources/base | kubectl apply -f - - name: Install KF Pipelines run: ./tests/gh-actions/install_pipelines.sh diff --git a/.github/workflows/pipeline_swfs_test.yaml b/.github/workflows/pipeline_swfs_test.yaml index 27b9b4e6e1..0055926fdd 100644 --- a/.github/workflows/pipeline_swfs_test.yaml +++ b/.github/workflows/pipeline_swfs_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/pipeline_swfs_test.yaml - apps/pipeline/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - tests/gh-actions/install_cert_manager.sh - tests/gh-actions/install_oauth2-proxy.sh - common/cert-manager/** @@ -27,7 +27,7 @@ jobs: run: ./tests/gh-actions/install_kubectl.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh @@ -45,7 +45,7 @@ jobs: run: ./tests/gh-actions/install_multi_tenancy.sh - name: Install kubeflow-istio-resources - run: kustomize build common/istio-1-23/kubeflow-istio-resources/base | kubectl apply -f - + run: kustomize build common/istio-cni-1-23/kubeflow-istio-resources/base | kubectl apply -f - - name: Create KF Profile run: kustomize build common/user-namespace/base | kubectl apply -f - diff --git a/.github/workflows/pipeline_test.yaml b/.github/workflows/pipeline_test.yaml index 792d5937e9..6e4d77ace9 100644 --- a/.github/workflows/pipeline_test.yaml +++ b/.github/workflows/pipeline_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/pipeline_test.yaml - apps/pipeline/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - tests/gh-actions/install_cert_manager.sh - tests/gh-actions/install_oauth2-proxy.sh - common/cert-manager/** @@ -26,7 +26,7 @@ jobs: run: ./tests/gh-actions/install_kubectl.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh @@ -44,7 +44,7 @@ jobs: run: ./tests/gh-actions/install_multi_tenancy.sh - name: Install kubeflow-istio-resources - run: kustomize build common/istio-1-23/kubeflow-istio-resources/base | kubectl apply -f - + run: kustomize build common/istio-cni-1-23/kubeflow-istio-resources/base | kubectl apply -f - - name: Create KF Profile run: kustomize build common/user-namespace/base | kubectl apply -f - diff --git a/.github/workflows/profiles_test.yaml b/.github/workflows/profiles_test.yaml index c1ad802a82..9ab59c6252 100644 --- a/.github/workflows/profiles_test.yaml +++ b/.github/workflows/profiles_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/profiles_test.yaml - apps/profiles/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - common/istio*/** jobs: @@ -19,7 +19,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Build & Apply manifests run: | diff --git a/.github/workflows/ray_test.yaml b/.github/workflows/ray_test.yaml index e66e02fbce..bebf81a439 100644 --- a/.github/workflows/ray_test.yaml +++ b/.github/workflows/ray_test.yaml @@ -17,7 +17,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh diff --git a/.github/workflows/spark_test.yaml b/.github/workflows/spark_test.yaml index 3273159294..2bdfe18c24 100644 --- a/.github/workflows/spark_test.yaml +++ b/.github/workflows/spark_test.yaml @@ -17,7 +17,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh diff --git a/.github/workflows/tensorboard_controller_test.yaml b/.github/workflows/tensorboard_controller_test.yaml index f6b248fde8..a5a7c8c98e 100644 --- a/.github/workflows/tensorboard_controller_test.yaml +++ b/.github/workflows/tensorboard_controller_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/tensorboard_controller_test.yaml - apps/tensorboard/tensorboard-controller/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - common/istio*/** jobs: @@ -19,7 +19,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Build & Apply manifests run: | diff --git a/.github/workflows/tensorboards_web_application_test.yaml b/.github/workflows/tensorboards_web_application_test.yaml index 377f83c47c..dd7e5d68ef 100644 --- a/.github/workflows/tensorboards_web_application_test.yaml +++ b/.github/workflows/tensorboards_web_application_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/tensorboards_web_application_test.yaml - apps/tensorboard/tensorboards-web-app/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - common/istio*/** jobs: @@ -19,7 +19,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Build & Apply manifests run: | diff --git a/.github/workflows/training_operator_test.yaml b/.github/workflows/training_operator_test.yaml index d90957c2bc..6728d06240 100644 --- a/.github/workflows/training_operator_test.yaml +++ b/.github/workflows/training_operator_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/training_operator_test.yaml - apps/training-operator/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - common/istio*/** - tests/gh-actions/kf-objects/tfjob.yaml @@ -23,7 +23,7 @@ jobs: run: ./tests/gh-actions/install_kubectl.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Install oauth2-proxy run: ./tests/gh-actions/install_oauth2-proxy.sh @@ -38,7 +38,7 @@ jobs: run: ./tests/gh-actions/install_multi_tenancy.sh - name: Install kubeflow-istio-resources - run: kustomize build common/istio-1-23/kubeflow-istio-resources/base | kubectl apply -f - + run: kustomize build common/istio-cni-1-23/kubeflow-istio-resources/base | kubectl apply -f - - name: Create KF Profile run: kustomize build common/user-namespace/base | kubectl apply -f - diff --git a/.github/workflows/volumes_web_application_test.yaml b/.github/workflows/volumes_web_application_test.yaml index 7305d3bde2..cbe337ad2e 100644 --- a/.github/workflows/volumes_web_application_test.yaml +++ b/.github/workflows/volumes_web_application_test.yaml @@ -5,7 +5,7 @@ on: - tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - .github/workflows/volumes_web_application_test.yaml - apps/volumes-web-app/upstream/** - - tests/gh-actions/install_istio.sh + - tests/gh-actions/install_istio-cni.sh - common/istio*/** jobs: @@ -19,7 +19,7 @@ jobs: run: ./tests/gh-actions/install_KinD_create_KinD_cluster_install_kustomize.sh - name: Install Istio - run: ./tests/gh-actions/install_istio.sh + run: ./tests/gh-actions/install_istio-cni.sh - name: Build & Apply manifests run: | diff --git a/README.md b/README.md index 871a8c36eb..e0a1b85213 100644 --- a/README.md +++ b/README.md @@ -207,13 +207,13 @@ network authorization and implement routing policies. If you use Cilium CNI on your cluster, you have to configure it properly for Istio as shown [here](https://docs.cilium.io/en/latest/network/servicemesh/istio/), otherwise you will get RBAC access denied on the central dashboard. -Install Istio: +Install Istio-CNI: ```sh -echo "Installing Istio configured with external authorization..." -kustomize build common/istio-1-23/istio-crds/base | kubectl apply -f - -kustomize build common/istio-1-23/istio-namespace/base | kubectl apply -f - -kustomize build common/istio-1-23/istio-install/overlays/oauth2-proxy | kubectl apply -f - +echo "Installing Istio-CNI configured with external authorization..." +kustomize build common/istio-cni-1-23/istio-crds/base | kubectl apply -f - +kustomize build common/istio-cni-1-23/istio-namespace/base | kubectl apply -f - +kustomize build common/istio-cni-1-23/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 @@ -343,7 +343,7 @@ Install Knative Serving: ```sh kustomize build common/knative/knative-serving/overlays/gateways | kubectl apply -f - -kustomize build common/istio-1-23/cluster-local-gateway/base | kubectl apply -f - +kustomize build common/istio-cni-1-23/cluster-local-gateway/base | kubectl apply -f - ``` Optionally, you can install Knative Eventing which can be used for inference request logging: @@ -390,7 +390,7 @@ Create the Kubeflow Gateway, `kubeflow-gateway` and ClusterRole, Install kubeflow istio resources: ```sh -kustomize build common/istio-1-23/kubeflow-istio-resources/base | kubectl apply -f - +kustomize build common/istio-cni-1-23/kubeflow-istio-resources/base | kubectl apply -f - ``` #### Kubeflow Pipelines diff --git a/common/oauth2-proxy/components/README.md b/common/oauth2-proxy/components/README.md index 8332d6d5ec..12ca9196dd 100644 --- a/common/oauth2-proxy/components/README.md +++ b/common/oauth2-proxy/components/README.md @@ -154,9 +154,9 @@ make the following changes to the `example/kustomization.yaml` file: * use `oauth2-proxy` overlay for istio-install ``` # from - - ../common/istio-1-23/istio-install/base + - ../common/istio-cni-1-23/istio-install/base # to - - ../common/istio-1-23/istio-install/overlays/oauth2-proxy + - ../common/istio-cni-1-23/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 @@ -189,12 +189,12 @@ index c1a85789..4a50440c 100644 +++ b/example/kustomization.yaml @@ -38,11 +38,11 @@ resources: # Istio - - ../common/istio-1-23/istio-crds/base - - ../common/istio-1-23/istio-namespace/base --- ../common/istio-1-23/istio-install/base + - ../common/istio-cni-1-23/istio-crds/base + - ../common/istio-cni-1-23/istio-namespace/base +-- ../common/istio-cni-1-23/istio-install/base -# OIDC Authservice -- ../common//oidc-authservice/base -+- ../common/istio-1-23/istio-install/overlays/oauth2-proxy ++- ../common/istio-cni-1-23/istio-install/overlays/oauth2-proxy +# oauth2-proxy for OIDC +- ../common/oauth2-proxy/overlays/m2m-dex-and-kind # Dex diff --git a/contrib/kserve/README.md b/contrib/kserve/README.md index d0ae01118b..e67a1051b9 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-23/istio-crds/base - kubectl apply -k ../../common/istio-1-23/istio-namespace/base - kubectl apply -k ../../common/istio-1-23/istio-install/base + kubectl apply -k ../../common/istio-cni-1-23/istio-crds/base + kubectl apply -k ../../common/istio-cni-1-23/istio-namespace/base + kubectl apply -k ../../common/istio-cni-1-23/istio-install/base ``` 6. Install knative ```sh kubectl apply -k ../../common/knative/knative-serving/overlays/gateways - kubectl apply -k ../../common/istio-1-23/cluster-local-gateway/base - kubectl apply -k ../../common/istio-1-23/kubeflow-istio-resources/base + kubectl apply -k ../../common/istio-cni-1-23/cluster-local-gateway/base + kubectl apply -k ../../common/istio-cni-1-23/kubeflow-istio-resources/base ``` 7. Install kserve ```sh diff --git a/contrib/ray/kuberay-operator/overlays/kubeflow/disable-injection.yaml b/contrib/ray/kuberay-operator/overlays/kubeflow/disable-injection.yaml new file mode 100644 index 0000000000..bb757416a1 --- /dev/null +++ b/contrib/ray/kuberay-operator/overlays/kubeflow/disable-injection.yaml @@ -0,0 +1,13 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: kuberay-operator + namespace: kubeflow +spec: + template: + spec: + containers: + - name: kuberay-operator + env: + - name: ENABLE_INIT_CONTAINER_INJECTION + value: "false" diff --git a/contrib/ray/kuberay-operator/overlays/kubeflow/kustomization.yaml b/contrib/ray/kuberay-operator/overlays/kubeflow/kustomization.yaml index 5520f1897a..49421b7e53 100644 --- a/contrib/ray/kuberay-operator/overlays/kubeflow/kustomization.yaml +++ b/contrib/ray/kuberay-operator/overlays/kubeflow/kustomization.yaml @@ -1,3 +1,6 @@ namespace: kubeflow resources: - ../../base + +patches: +- path: disable-injection.yaml diff --git a/contrib/ray/test.sh b/contrib/ray/test.sh index 71c8c5eaeb..02c82b4d59 100755 --- a/contrib/ray/test.sh +++ b/contrib/ray/test.sh @@ -33,7 +33,7 @@ kubectl label namespace $NAMESPACE istio-injection=enabled kubectl get namespaces --selector=istio-injection=enabled # Install KubeRay operator -kustomize build kuberay-operator/overlays/standalone | kubectl -n kubeflow apply --server-side -f - +kustomize build kuberay-operator/overlays/kubeflow | kubectl -n kubeflow apply --server-side -f - # Wait for the operator to be ready. kubectl -n kubeflow wait --for=condition=available --timeout=600s deploy/kuberay-operator @@ -87,4 +87,4 @@ for ((i=0; i