airship
/
airshipctl
Code Issues Proposed changes

Merge "Fixes namespace issue in capd"

This commit is contained in:
Zuul 2021-10-21 18:37:10 +00:00 committed by Gerrit Code Review
parent b56c101942 4981514fa7
commit 786ef6c622
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/function/k8scontrol-capd/cluster.yaml
View File

@ -15,12 +15,10 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: DockerCluster kind: DockerCluster
name: "target-cluster" name: "target-cluster"
namespace: default
controlPlaneRef: controlPlaneRef:
kind: KubeadmControlPlane kind: KubeadmControlPlane
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
name: "target-cluster-control-plane" name: "target-cluster-control-plane"
namespace: default
--- ---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: DockerCluster kind: DockerCluster

1
manifests/function/k8scontrol-capd/controlplane.yaml
View File

@ -22,7 +22,6 @@ spec:
kind: DockerMachineTemplate kind: DockerMachineTemplate
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
name: "target-cluster-control-plane" name: "target-cluster-control-plane"
namespace: default
kubeadmConfigSpec: kubeadmConfigSpec:
clusterConfiguration: clusterConfiguration:
controllerManager: controllerManager:

3
manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
View File

@ -2,6 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ../../../../function/k8scontrol-capd - ../../../../function/k8scontrol-capd
- namespace.yaml
namespace: target-infra
patchesJson6902: patchesJson6902:
- target: - target:

5
manifests/site/docker-test-site/ephemeral/controlplane/namespace.yaml Normal file
View File

@ -0,0 +1,5 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: target-infra