Merge "Split out k8scontrol oidc patching"
This commit is contained in:
commit
13ba7c026a
|
@ -1,25 +1,15 @@
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
|
|
||||||
resources:
|
|
||||||
- ../../../../airshipctl/manifests/function/k8scontrol
|
|
||||||
- dex-ca-cert-secret.yaml
|
|
||||||
|
|
||||||
namespace: target-infra
|
namespace: target-infra
|
||||||
|
|
||||||
|
resources:
|
||||||
|
- ../k8scontrol-oidc
|
||||||
|
|
||||||
patches:
|
patches:
|
||||||
- target:
|
|
||||||
group: controlplane.cluster.x-k8s.io
|
|
||||||
version: v1alpha3
|
|
||||||
kind: KubeadmControlPlane
|
|
||||||
path: oidc-apiserver-ca-cert.json
|
|
||||||
- target:
|
- target:
|
||||||
group: controlplane.cluster.x-k8s.io
|
group: controlplane.cluster.x-k8s.io
|
||||||
version: v1alpha3
|
version: v1alpha3
|
||||||
kind: KubeadmControlPlane
|
kind: KubeadmControlPlane
|
||||||
path: vrrp_keepalived_patch.yaml
|
path: vrrp_keepalived_patch.yaml
|
||||||
- target:
|
|
||||||
group: controlplane.cluster.x-k8s.io
|
|
||||||
version: v1alpha3
|
|
||||||
kind: KubeadmControlPlane
|
|
||||||
path: oidc-apiserver-extra-args.yaml
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
resources:
|
resources:
|
||||||
- ../../../../../airshipctl/manifests/function/k8scontrol/replacements
|
- ../../k8scontrol-oidc/replacements
|
||||||
- networking-ha.yaml
|
- networking-ha.yaml
|
||||||
- update-dex.yaml
|
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
|
kind: Kustomization
|
||||||
|
|
||||||
|
resources:
|
||||||
|
- ../../../../airshipctl/manifests/function/k8scontrol
|
||||||
|
- dex-ca-cert-secret.yaml
|
||||||
|
|
||||||
|
patches:
|
||||||
|
- target:
|
||||||
|
group: controlplane.cluster.x-k8s.io
|
||||||
|
version: v1alpha3
|
||||||
|
kind: KubeadmControlPlane
|
||||||
|
path: oidc-apiserver-ca-cert.json
|
||||||
|
- target:
|
||||||
|
group: controlplane.cluster.x-k8s.io
|
||||||
|
version: v1alpha3
|
||||||
|
kind: KubeadmControlPlane
|
||||||
|
path: oidc-apiserver-extra-args.yaml
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
resources:
|
||||||
|
- ../../../../../airshipctl/manifests/function/k8scontrol/replacements
|
||||||
|
- update-dex.yaml
|
|
@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
resources:
|
resources:
|
||||||
- ../../../../../airshipctl/manifests/function/k8scontrol
|
- ../../../../../airshipctl/manifests/function/k8scontrol
|
||||||
|
# Switch to this once we want to add Dex back in
|
||||||
|
#- ../../../function/k8scontrol-oidc
|
||||||
|
|
||||||
patchesJson6902:
|
patchesJson6902:
|
||||||
- target:
|
- target:
|
||||||
|
|
Loading…
Reference in New Issue