consolidate dex manifests (kubeflow#1771)

Dex has a bunch of kustomizations related to peripheral projects: - An LDAP database - The Dex Authenticator project - Keycloak Gatekeeper The manifests WG only maintains the Dex manifests. Thus, move all other manifests in the contrib folder. Signed-off-by: Yannis Zarkadas <[email protected]>
surajkota · Mar 22, 2021 · 79c0aa0 · 79c0aa0
1 parent fc7a523
commit 79c0aa0
Show file tree

Hide file tree

Showing 48 changed files with 28 additions and 119 deletions.
diff --git a/common/dex-auth/dex-crds/base_v3/kustomization.yaml b/common/dex-auth/dex-crds/base_v3/kustomization.yaml
diff --git a/common/dex-auth/dex-crds/overlays/istio/kustomization.yaml b/common/dex-auth/dex-crds/overlays/istio/kustomization.yaml
diff --git a/common/dex-auth/dex-crds/overlays/istio/params.env b/common/dex-auth/dex-crds/overlays/istio/params.env
diff --git a/common/dex-auth/OWNERS → common/dex/OWNERS b/common/dex-auth/OWNERS → common/dex/OWNERS
diff --git a/...on/dex-auth/dex-crds/base/config-map.yaml → common/dex/base/config-map.yaml b/...on/dex-auth/dex-crds/base/config-map.yaml → common/dex/base/config-map.yaml
diff --git a/common/dex-auth/dex-crds/base/crds.yaml → common/dex/base/crds.yaml b/common/dex-auth/dex-crds/base/crds.yaml → common/dex/base/crds.yaml
diff --git a/...on/dex-auth/dex-crds/base/deployment.yaml → common/dex/base/deployment.yaml b/...on/dex-auth/dex-crds/base/deployment.yaml → common/dex/base/deployment.yaml
diff --git a/...dex-auth/dex-crds/base/kustomization.yaml → common/dex/base/kustomization.yaml b/...dex-auth/dex-crds/base/kustomization.yaml → common/dex/base/kustomization.yaml
@@ -14,13 +14,6 @@ configMapGenerator:
 generatorOptions:
   disableNameSuffixHash: true
 vars:
-- name: dex_domain
-  objref:
-    kind: ConfigMap
-    name: dex-parameters
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.dex_domain
 - name: issuer
   objref:
     kind: ConfigMap

diff --git a/...uth/dex-authenticator/base/namespace.yaml → common/dex/base/namespace.yaml b/...uth/dex-authenticator/base/namespace.yaml → common/dex/base/namespace.yaml
diff --git a/common/dex-auth/dex-crds/base/params.env → common/dex/base/params.env b/common/dex-auth/dex-crds/base/params.env → common/dex/base/params.env
@@ -1,5 +1,4 @@
 # Dex Server Parameters (some params are shared with client)
-dex_domain=dex.example.com
 # Set issuer to https if tls is enabled
 issuer=http://dex.example.com:32000
 static_email=[email protected]

diff --git a/common/dex-auth/dex-crds/base/params.yaml → common/dex/base/params.yaml b/common/dex-auth/dex-crds/base/params.yaml → common/dex/base/params.yaml
diff --git a/common/dex-auth/dex-crds/base/service.yaml → common/dex/base/service.yaml b/common/dex-auth/dex-crds/base/service.yaml → common/dex/base/service.yaml
diff --git a/.../dex-crds/overlays/github/config-map.yaml → common/dex/overlays/github/config-map.yaml b/.../dex-crds/overlays/github/config-map.yaml → common/dex/overlays/github/config-map.yaml
diff --git a/...x-crds/overlays/github/kustomization.yaml → ...on/dex/overlays/github/kustomization.yaml b/...x-crds/overlays/github/kustomization.yaml → ...on/dex/overlays/github/kustomization.yaml
diff --git a/...-auth/dex-crds/overlays/github/params.env → common/dex/overlays/github/params.env b/...-auth/dex-crds/overlays/github/params.env → common/dex/overlays/github/params.env
diff --git a/...auth/dex-crds/overlays/github/params.yaml → common/dex/overlays/github/params.yaml b/...auth/dex-crds/overlays/github/params.yaml → common/dex/overlays/github/params.yaml
diff --git a/...crds/overlays/github/virtual-service.yaml → .../dex/overlays/github/virtual-service.yaml b/...crds/overlays/github/virtual-service.yaml → .../dex/overlays/github/virtual-service.yaml
diff --git a/common/dex/overlays/istio/kustomization.yaml b/common/dex/overlays/istio/kustomization.yaml
@@ -0,0 +1,24 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+- ../../base
+resources:
+- virtual-service.yaml
+
+vars:
+- name: DEX_SERVICE
+  objref:
+    kind: Service
+    name: dex
+    apiVersion: v1
+  fieldref:
+    fieldpath: metadata.name
+- name: DEX_NAMESPACE
+  objref:
+    kind: Service
+    name: dex
+    apiVersion: v1
+  fieldref:
+    fieldpath: metadata.namespace
+configurations:
+- params.yaml
diff --git a/...-auth/dex-crds/overlays/istio/params.yaml → common/dex/overlays/istio/params.yaml b/...-auth/dex-crds/overlays/istio/params.yaml → common/dex/overlays/istio/params.yaml
diff --git a/...-crds/overlays/istio/virtual-service.yaml → ...n/dex/overlays/istio/virtual-service.yaml b/...-crds/overlays/istio/virtual-service.yaml → ...n/dex/overlays/istio/virtual-service.yaml
@@ -17,6 +17,6 @@ spec:
         prefix: /dex/
     route:
     - destination:
-        host: dex.$(namespace).svc.cluster.local
+        host: $(DEX_SERVICE).$(DEX_NAMESPACE).svc.cluster.local
         port:
           number: 5556
diff --git a/...th/dex-crds/overlays/ldap/config-map.yaml → common/dex/overlays/ldap/config-map.yaml b/...th/dex-crds/overlays/ldap/config-map.yaml → common/dex/overlays/ldap/config-map.yaml
diff --git a/...th/dex-crds/overlays/ldap/deployment.yaml → common/dex/overlays/ldap/deployment.yaml b/...th/dex-crds/overlays/ldap/deployment.yaml → common/dex/overlays/ldap/deployment.yaml
diff --git a/...dex-crds/overlays/ldap/kustomization.yaml → common/dex/overlays/ldap/kustomization.yaml b/...dex-crds/overlays/ldap/kustomization.yaml → common/dex/overlays/ldap/kustomization.yaml
diff --git a/...ex-auth/dex-crds/overlays/ldap/params.env → common/dex/overlays/ldap/params.env b/...ex-auth/dex-crds/overlays/ldap/params.env → common/dex/overlays/ldap/params.env
diff --git a/...x-auth/dex-authenticator/base/params.yaml → common/dex/overlays/ldap/params.yaml b/...x-auth/dex-authenticator/base/params.yaml → common/dex/overlays/ldap/params.yaml
diff --git a/contrib/dex-auth/OWNERS b/contrib/dex-auth/OWNERS
@@ -0,0 +1,3 @@
+approvers:
+  - krishnadurai
+  - yanniszark
diff --git a/common/dex-auth/README.md → contrib/dex-auth/README.md b/common/dex-auth/README.md → contrib/dex-auth/README.md
diff --git a/...th/dex-authenticator/base/config-map.yaml → ...th/dex-authenticator/base/config-map.yaml b/...th/dex-authenticator/base/config-map.yaml → ...th/dex-authenticator/base/config-map.yaml
diff --git a/...th/dex-authenticator/base/deployment.yaml → ...th/dex-authenticator/base/deployment.yaml b/...th/dex-authenticator/base/deployment.yaml → ...th/dex-authenticator/base/deployment.yaml
diff --git a/...dex-authenticator/base/kustomization.yaml → ...dex-authenticator/base/kustomization.yaml b/...dex-authenticator/base/kustomization.yaml → ...dex-authenticator/base/kustomization.yaml
diff --git a/common/dex-auth/dex-crds/base/namespace.yaml → ...uth/dex-authenticator/base/namespace.yaml b/common/dex-auth/dex-crds/base/namespace.yaml → ...uth/dex-authenticator/base/namespace.yaml
diff --git a/...ex-auth/dex-authenticator/base/params.env → ...ex-auth/dex-authenticator/base/params.env b/...ex-auth/dex-authenticator/base/params.env → ...ex-auth/dex-authenticator/base/params.env
diff --git a/...x-auth/dex-crds/overlays/ldap/params.yaml → ...x-auth/dex-authenticator/base/params.yaml b/...x-auth/dex-crds/overlays/ldap/params.yaml → ...x-auth/dex-authenticator/base/params.yaml
diff --git a/...-auth/dex-authenticator/base/service.yaml → ...-auth/dex-authenticator/base/service.yaml b/...-auth/dex-authenticator/base/service.yaml → ...-auth/dex-authenticator/base/service.yaml
diff --git a/...-authenticator/base_v3/kustomization.yaml → ...-authenticator/base_v3/kustomization.yaml b/...-authenticator/base_v3/kustomization.yaml → ...-authenticator/base_v3/kustomization.yaml
diff --git a/...on/dex-auth/dex-ldap/base/deployment.yaml → ...ib/dex-auth/dex-ldap/base/deployment.yaml b/...on/dex-auth/dex-ldap/base/deployment.yaml → ...ib/dex-auth/dex-ldap/base/deployment.yaml
diff --git a/...dex-auth/dex-ldap/base/kustomization.yaml → ...dex-auth/dex-ldap/base/kustomization.yaml b/...dex-auth/dex-ldap/base/kustomization.yaml → ...dex-auth/dex-ldap/base/kustomization.yaml
diff --git a/common/dex-auth/dex-ldap/base/namespace.yaml → ...rib/dex-auth/dex-ldap/base/namespace.yaml b/common/dex-auth/dex-ldap/base/namespace.yaml → ...rib/dex-auth/dex-ldap/base/namespace.yaml
diff --git a/common/dex-auth/dex-ldap/base/service.yaml → contrib/dex-auth/dex-ldap/base/service.yaml b/common/dex-auth/dex-ldap/base/service.yaml → contrib/dex-auth/dex-ldap/base/service.yaml
diff --git a/.../keycloak-gatekeeper/base/config-map.yaml → .../keycloak-gatekeeper/base/config-map.yaml b/.../keycloak-gatekeeper/base/config-map.yaml → .../keycloak-gatekeeper/base/config-map.yaml
diff --git a/.../keycloak-gatekeeper/base/deployment.yaml → .../keycloak-gatekeeper/base/deployment.yaml b/.../keycloak-gatekeeper/base/deployment.yaml → .../keycloak-gatekeeper/base/deployment.yaml
diff --git a/...ycloak-gatekeeper/base/kustomization.yaml → ...ycloak-gatekeeper/base/kustomization.yaml b/...ycloak-gatekeeper/base/kustomization.yaml → ...ycloak-gatekeeper/base/kustomization.yaml
diff --git a/...h/keycloak-gatekeeper/base/namespace.yaml → ...h/keycloak-gatekeeper/base/namespace.yaml b/...h/keycloak-gatekeeper/base/namespace.yaml → ...h/keycloak-gatekeeper/base/namespace.yaml
diff --git a/...-auth/keycloak-gatekeeper/base/params.env → ...-auth/keycloak-gatekeeper/base/params.env b/...-auth/keycloak-gatekeeper/base/params.env → ...-auth/keycloak-gatekeeper/base/params.env
diff --git a/...auth/keycloak-gatekeeper/base/params.yaml → ...auth/keycloak-gatekeeper/base/params.yaml b/...auth/keycloak-gatekeeper/base/params.yaml → ...auth/keycloak-gatekeeper/base/params.yaml
diff --git a/...uth/keycloak-gatekeeper/base/service.yaml → ...uth/keycloak-gatekeeper/base/service.yaml b/...uth/keycloak-gatekeeper/base/service.yaml → ...uth/keycloak-gatekeeper/base/service.yaml
diff --git a/...cloak-gatekeeper/base/virtualservice.yaml → ...cloak-gatekeeper/base/virtualservice.yaml b/...cloak-gatekeeper/base/virtualservice.yaml → ...cloak-gatekeeper/base/virtualservice.yaml
diff --git a/...oak-gatekeeper/base_v3/kustomization.yaml → ...oak-gatekeeper/base_v3/kustomization.yaml b/...oak-gatekeeper/base_v3/kustomization.yaml → ...oak-gatekeeper/base_v3/kustomization.yaml