diff --git a/common/istio-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml b/common/istio-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml index f083b720a6..086e1bdb88 100644 --- a/common/istio-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml +++ b/common/istio-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml @@ -5,4 +5,4 @@ resources: - ../../base components: -- ../../../../oidc-client/oauth2-proxy/components/istio-external-auth +- ../../../../oidc-client/oauth2-proxy/components/istio-external-auth-patches diff --git a/common/istio-cni-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml b/common/istio-cni-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml index f083b720a6..086e1bdb88 100644 --- a/common/istio-cni-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml +++ b/common/istio-cni-1-17/istio-install/overlays/oauth2-proxy/kustomization.yaml @@ -5,4 +5,4 @@ resources: - ../../base components: -- ../../../../oidc-client/oauth2-proxy/components/istio-external-auth +- ../../../../oidc-client/oauth2-proxy/components/istio-external-auth-patches diff --git a/common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/README.md b/common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/README.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/kustomization.yaml b/common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/kustomization.yaml new file mode 100644 index 0000000000..25748f867c --- /dev/null +++ b/common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: +- path: patches/cm.enable-oauth2-proxy.yaml +- path: patches/deployment.jwt-refresh-interval.yaml diff --git a/common/oidc-client/oauth2-proxy/components/istio-external-auth/patches/cm.enable-oauth2-proxy.yaml b/common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/patches/cm.enable-oauth2-proxy.yaml similarity index 100% rename from common/oidc-client/oauth2-proxy/components/istio-external-auth/patches/cm.enable-oauth2-proxy.yaml rename to common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/patches/cm.enable-oauth2-proxy.yaml diff --git a/common/oidc-client/oauth2-proxy/components/istio-external-auth/patches/deployment.jwt-refresh-interval.yaml b/common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/patches/deployment.jwt-refresh-interval.yaml similarity index 100% rename from common/oidc-client/oauth2-proxy/components/istio-external-auth/patches/deployment.jwt-refresh-interval.yaml rename to common/oidc-client/oauth2-proxy/components/istio-external-auth-patches/patches/deployment.jwt-refresh-interval.yaml diff --git a/common/oidc-client/oauth2-proxy/components/istio-external-auth/kustomization.yaml b/common/oidc-client/oauth2-proxy/components/istio-external-auth/kustomization.yaml index b335219d36..ec79597930 100644 --- a/common/oidc-client/oauth2-proxy/components/istio-external-auth/kustomization.yaml +++ b/common/oidc-client/oauth2-proxy/components/istio-external-auth/kustomization.yaml @@ -9,7 +9,3 @@ resources: # authorizationpolicy.istio-ingressgateway-oauth2-proxy-cloudflare.yaml # instead of # authorizationpolicy.istio-ingressgateway-oauth2-proxy.yaml - -patches: -- path: patches/cm.enable-oauth2-proxy.yaml -- path: patches/deployment.jwt-refresh-interval.yaml diff --git a/common/oidc-client/oauth2-proxy/overlays/m2m-self-signed/kustomization.yaml b/common/oidc-client/oauth2-proxy/overlays/m2m-self-signed/kustomization.yaml index 0ad0711fb9..fd56fa3152 100644 --- a/common/oidc-client/oauth2-proxy/overlays/m2m-self-signed/kustomization.yaml +++ b/common/oidc-client/oauth2-proxy/overlays/m2m-self-signed/kustomization.yaml @@ -6,6 +6,7 @@ resources: components: - ../../components/istio-m2m +- ../../components/istio-external-auth - ../../components/allow-unauthenticated-issuer-discovery - ../../components/configure-self-signed-kubernetes-oidc-issuer diff --git a/common/oidc-client/oauth2-proxy/overlays/m2m/kustomization.yaml b/common/oidc-client/oauth2-proxy/overlays/m2m/kustomization.yaml index 8b4e2eb47d..90db4a289a 100644 --- a/common/oidc-client/oauth2-proxy/overlays/m2m/kustomization.yaml +++ b/common/oidc-client/oauth2-proxy/overlays/m2m/kustomization.yaml @@ -6,6 +6,7 @@ resources: components: - ../../components/istio-m2m +- ../../components/istio-external-auth - component-overwrite-m2m-token-issuer configMapGenerator: