Skip to content

Commit

Permalink
restore 1.6 and add knative-local-gateway comment
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusvonkohout committed Jul 26, 2023
1 parent f184921 commit 64bffe9
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 11 deletions.
30 changes: 27 additions & 3 deletions common/istio-1-16/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,39 @@ old version is `X1.Y1.Z1`:

---

5. Remove PodDisruptionBudget from `istio-install` and `cluster-local-gateway` kustomizations.
See https://github.com/istio/istio/issues/12602 and https://github.com/istio/istio/issues/24000

Until now we have used two patches:
- `common/istio-1-16/istio-install/base/patches/remove-pdb.yaml`
- `common/istio-1-16/cluster-local-gateway/base/patches/remove-pdb.yaml`

The above patches do not work with kustomize v3.2.0 as it doesn't have the appropriate
openapi schemas for the policy/v1 API version resources. This is fixed in kustomize v4+.
See https://github.com/kubernetes-sigs/kustomize/issues/3694#issuecomment-799700607 and
https://github.com/kubernetes-sigs/kustomize/issues/4495

A temporary workaround is to use the following instructions to manually delete the PodDisruptionBudget resources with `yq`:

$ yq eval -i 'select((.kind == "PodDisruptionBudget" and .metadata.name == "cluster-local-gateway") | not)' common/istio-1-16/cluster-local-gateway/base/cluster-local-gateway.yaml
$ yq eval -i 'select((.kind == "PodDisruptionBudget" and .metadata.name == "istio-ingressgateway") | not)' common/istio-1-16/istio-install/base/install.yaml
$ yq eval -i 'select((.kind == "PodDisruptionBudget" and .metadata.name == "istiod") | not)' common/istio-1-16/istio-install/base/install.yaml

---
**NOTE**

NOTE: Make sure to remove a redundant {} at the end of the `common/istio-1-16/istio-install/base/install.yaml` and `common/istio-1-16/cluster-local-gateway/base/cluster-local-gateway.yaml` files.

---

## Changes to Istio's upstream manifests

### Changes to the upstream IstioOperator profile

Changes to Istio's upstream profile `default` are the following:

- Add a `cluster-local-gateway` component for KServe.
# TODO i think we can drop this gateway now
- Disable the EgressGateway component. We do not use it and it adds
- Add a `cluster-local-gateway` component for KFServing.
- Disable the EgressGateway component. We don't use it and it adds
unnecessary complexity.

Those changes are captured in the [profile-overlay.yaml](profile-overlay.yaml)
Expand Down
2 changes: 1 addition & 1 deletion common/istio-1-17/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ old version is `X1.Y1.Z1`:

Changes to Istio's upstream profile `default` are the following:

- Add a `cluster-local-gateway` component for Kserve. TODO this might be removed for newer Kserve
- Add a `cluster-local-gateway` component for Kserve. Knative-local-gateway is now obsolete https://github.com/kubeflow/manifests/pull/2355/commits/adc00b804404ea08685a044ae595be0bed9adb59.
- Disable the EgressGateway component. We do not use it and it adds unnecessary complexity.

Those changes are captured in the [profile-overlay.yaml](profile-overlay.yaml)
Expand Down
17 changes: 10 additions & 7 deletions common/istio-1-17/cluster-local-gateway/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
#
# Copyright © 2020 Arrikto Inc. All Rights Reserved.
#

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: istio-system

resources:
- cluster-local-gateway.yaml
- gateway-authorizationpolicy.yaml
- install.yaml
- gateway_authorizationpolicy.yaml
- deny_all_authorizationpolicy.yaml
- gateway.yaml
- x-forwarded-host.yaml

patchesStrategicMerge:
- patches/remove-pdb.yaml
- patches/service.yaml
- patches/istio-configmap-disable-tracing.yaml
- patches/disable-debugging.yaml
# Disable this patch until we upgrade to kustomize to v4+
# see https://github.com/kubeflow/manifests/issues/2325#issuecomment-1323909056
# - patches/remove-pdb.yaml

0 comments on commit 64bffe9

Please sign in to comment.