Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update of istio to v1.22.0 along with updating github workflows #2736

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/kserve_cni_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/notebook_controller_m2m_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/pipeline_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,25 @@ 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

- name: Install KF Multi Tenancy
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 -
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <br /> common/knative/knative-eventing | [v1.12.4](https://github.com/knative/serving/releases/tag/knative-v1.12.4) <br /> [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) |

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,7 @@ data:
"sts": {
"servicePort": 0
},
"tag": "1.17.5",
"tag": "1.22.0",
"tracer": {
"datadog": {
"address": "$(HOST_IP):8126"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
proxyMetadata: {}
enablePrometheusMerge: true
profile: default
tag: 1.17.5
tag: 1.22.0
values:
base:
enableCRDTemplates: false
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1760,7 +1760,7 @@ data:
"sts": {
"servicePort": 0
},
"tag": "1.17.5",
"tag": "1.22.0",
"tracer": {
"datadog": {
"address": "$(HOST_IP):8126"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
proxyMetadata: {}
enablePrometheusMerge: true
profile: default
tag: 1.17.5
tag: 1.22.0
values:
base:
enableCRDTemplates: false
Expand Down
12 changes: 6 additions & 6 deletions common/oidc-client/oauth2-proxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions contrib/kserve/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions example/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ 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
- ../common/dex/overlays/oauth2-proxy
# 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
- ../common/networkpolicies/base
# 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
Expand Down
2 changes: 1 addition & 1 deletion hack/extract_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/gh-actions/install_istio-cni.sh
Original file line number Diff line number Diff line change
@@ -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 -
2 changes: 1 addition & 1 deletion tests/gh-actions/install_istio.sh
Original file line number Diff line number Diff line change
@@ -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 -
Expand Down
2 changes: 1 addition & 1 deletion tests/gh-actions/install_istio_with_ext_auth.sh
Original file line number Diff line number Diff line change
@@ -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 -
Expand Down
4 changes: 2 additions & 2 deletions tests/gh-actions/install_knative-cni.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions tests/gh-actions/install_knative.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading