Changes in dex function to work for both target cluster as well as sub-clusters along with few enhancements

Depends-On: https://review.opendev.org/c/airship/airshipctl/+/792316

Change-Id: I13f97faec5523b6ae86cd0a578d4b76c8c1344a2
This commit is contained in:
sa069q 2021-05-18 17:42:32 +05:30
parent 1534abf6ad
commit f0aa07c82f
3 changed files with 5 additions and 24 deletions

View File

@ -1,8 +1,7 @@
apiVersion: cert-manager.io/v1alpha2 apiVersion: cert-manager.io/v1alpha2
kind: Issuer kind: Issuer
metadata: metadata:
name: workload-cluster-ca-issuer name: dex
namespace: default
spec: spec:
ca: ca:
secret: dex-apiserver-secret secretName: dex-apiserver-secret

View File

@ -1,18 +1,3 @@
apiVersion: v1
kind: Namespace
metadata:
name: dex
---
# Dex Helm Charts from Helm Repository (Helm Collator)
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
name: dex-helm-repo
namespace: collator
spec:
interval: 5m
url: http://helm-chart-collator.collator.svc:8080
---
# Dex Helm Charts from Git Repository # Dex Helm Charts from Git Repository
# apiVersion: source.toolkit.fluxcd.io/v1beta1 # apiVersion: source.toolkit.fluxcd.io/v1beta1
# kind: GitRepository # kind: GitRepository
@ -29,10 +14,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease kind: HelmRelease
metadata: metadata:
name: dex-aio name: dex-aio
namespace: default
spec: spec:
releaseName: dex-aio
targetNamespace: dex
interval: 5m interval: 5m
chart: chart:
spec: spec:
@ -40,7 +22,7 @@ spec:
# Referencing Dex Helm charts from Helm Collator repo # Referencing Dex Helm charts from Helm Collator repo
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: dex-helm-repo name: helm-repo
namespace: collator namespace: collator
# Referencing Dex Helm charts from Git repo # Referencing Dex Helm charts from Git repo
# sourceRef: # sourceRef:
@ -60,7 +42,7 @@ spec:
tls: tls:
cert_manager: true cert_manager: true
issuer: issuer:
name: workload-cluster-ca-issuer name: dex
kind: Issuer kind: Issuer
oidc: oidc:
client_id: function-kubernetes client_id: function-kubernetes

View File

@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- dex-cert-issuer.yaml
- dex-helmrelease.yaml - dex-helmrelease.yaml
- dex-cert-issuer.yaml