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

feat(istio/kubeflow-gateway): update all configs to reference CNP kubeflow gateway. #318

Open
wants to merge 3 commits into
base: aaw-dev-cc-00
Choose a base branch
from
Open
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
10 changes: 10 additions & 0 deletions kustomize/apps/centraldashboard/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,13 @@ patchesStrategicMerge:
- deployment.yaml
- centraldashboard-config.yaml
- authorizationpolicy.yaml

patches:
# Patch all VirtualServices to use centralized Kubeflow ingress gateway
- patch: |-
- op: replace
path: /spec/gateways
value: ["istio-system/kubeflow-istio-ingress-gateway-https"]
target:
group: networking.istio.io
kind: VirtualService
10 changes: 10 additions & 0 deletions kustomize/apps/jupyter-web-app/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,13 @@ configMapGenerator:

generatorOptions:
disableNameSuffixHash: true

patches:
# Patch all VirtualServices to use centralized Kubeflow ingress gateway
- patch: |-
- op: replace
path: /spec/gateways
value: ["istio-system/kubeflow-istio-ingress-gateway-https"]
target:
group: networking.istio.io
kind: VirtualService
4 changes: 2 additions & 2 deletions kustomize/apps/jupyter-web-app/base/vs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: jupyter-web-app-jupyter-web-app
spec:
gateways:
- kubeflow-gateway
- istio-system/kubeflow-istio-ingress-gateway-https
hosts:
- '*'
http:
Expand All @@ -23,4 +23,4 @@ spec:
- destination:
host: jupyter-web-app-service.$(JWA_NAMESPACE).svc.$(JWA_CLUSTER_DOMAIN)
port:
number: 80
number: 80
10 changes: 10 additions & 0 deletions kustomize/apps/katib/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,13 @@ patchesJson6902:
- op: replace
path: "/apiVersion"
value: cert-manager.io/v1

patches:
# Patch all VirtualServices to use centralized Kubeflow ingress gateway
- patch: |-
- op: replace
path: /spec/gateways
value: ["istio-system/kubeflow-istio-ingress-gateway-https"]
target:
group: networking.istio.io
kind: VirtualService
8 changes: 8 additions & 0 deletions kustomize/apps/notebook-controller/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@ resources:

patchesStrategicMerge:
- deployment.yaml

configMapGenerator:
# Update the link to the Gateway to use.
# https://github.com/kubeflow/manifests/blob/c2795524afd97dc0776b804521bb7d937646e98f/apps/jupyter/notebook-controller/upstream/manager/kustomization.yaml#L5
- name: config
behavior: merge
literals:
- ISTIO_GATEWAY=istio-system/kubeflow-istio-ingress-gateway-https
11 changes: 10 additions & 1 deletion kustomize/apps/profiles/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ configMapGenerator:
files:
- namespace-labels.yaml


patchesStrategicMerge:
- deployment.yaml

patches:
# Patch all VirtualServices to use centralized Kubeflow ingress gateway
- patch: |-
- op: replace
path: /spec/gateways
value: ["istio-system/kubeflow-istio-ingress-gateway-https"]
target:
group: networking.istio.io
kind: VirtualService
62 changes: 0 additions & 62 deletions kustomize/common/knative/base/config-istio.yaml

This file was deleted.

16 changes: 15 additions & 1 deletion kustomize/common/knative/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:

patchesStrategicMerge:
- config-domain.yaml
- config-istio.yaml

patches:
- path: istio-webhook-deployment-patch.json
Expand Down Expand Up @@ -60,3 +59,18 @@ patchesJson6902:
- op: replace
path: "/spec/minReplicas"
value: 3

configMapGenerator:
# Replace the example ConfigMap and the patch coming in:
# https://github.com/kubeflow/manifests/blob/c2795524afd97dc0776b804521bb7d937646e98f/common/knative/knative-serving/base/patches/configmap-patch.yaml#L8
# https://github.com/kubeflow/manifests/blob/c2795524afd97dc0776b804521bb7d937646e98f/common/knative/knative-serving/base/upstream/net-istio.yaml#L63
- name: config-istio
namespace: knative-serving
behavior: replace
options:
disableNameSuffixHash: true
literals:
- gateway.ingress-general-system.general-istio-ingress-gateway-https=general.ingress-general-system.svc.cluster.local
- gateway.istio-system.kubeflow-istio-ingress-gateway-https=kubeflow.istio-system.svc.cluster.local
- local-gateway.istio-system.cluster-local-gateway=cluster-local-gateway.istio-system.svc.cluster.local
- local-gateway.mesh=mesh
7 changes: 7 additions & 0 deletions kustomize/contrib/kserve/base/kfserve-config-configmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v1
data:
ingressGateway: istio-system/kubeflow-istio-ingress-gateway-https
kind: ConfigMap
metadata:
name: kserve-config
namespace: kubeflow
1 change: 1 addition & 0 deletions kustomize/contrib/kserve/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ resources:

patchesStrategicMerge:
- inferenceservice-configmap.yaml
- kfserve-config-configmap.yaml

## Cert Manager
patchesJson6902:
Expand Down
16 changes: 16 additions & 0 deletions kustomize/contrib/seldon/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,19 @@ patchesJson6902:
- op: replace
path: "/apiVersion"
value: cert-manager.io/v1

patches:
- patch: |-
apiVersion: apps/v1
kind: Deployment
metadata:
name: seldon-controller-manager
namespace: kubeflow
spec:
template:
spec:
containers:
- name: manager
env:
- name: ISTIO_GATEWAY
value: istio-system/kubeflow-istio-ingress-gateway-https