Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CAPD manifests to use v1beta1 #979

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Update CAPD manifests to use v1beta1 #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9223572
Update CAPD manifests to use v1beta1
mrajashree Jan 18, 2022
6d828ec
Fix spacing for unit test
vivek-koppuru Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions pkg/providers/docker/config/template-cp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cluster.x-k8s.io/v1alpha3
apiVersion: cluster.x-k8s.io/v1beta1
kind: Cluster
metadata:
name: {{.clusterName}}
Expand All @@ -11,30 +11,30 @@ spec:
services:
cidrBlocks: {{.serviceCidrs}}
controlPlaneRef:
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlane
name: {{.clusterName}}
namespace: {{.eksaSystemNamespace}}
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerCluster
name: {{.clusterName}}
namespace: {{.eksaSystemNamespace}}
{{- if .externalEtcd }}
managedExternalEtcdRef:
apiVersion: etcdcluster.cluster.x-k8s.io/v1alpha3
apiVersion: etcdcluster.cluster.x-k8s.io/v1beta1
kind: EtcdadmCluster
name: {{.clusterName}}-etcd
namespace: {{.eksaSystemNamespace}}
{{- end }}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerCluster
metadata:
name: {{.clusterName}}
namespace: {{.eksaSystemNamespace}}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: {{.controlPlaneTemplateName}}
Expand All @@ -47,17 +47,18 @@ spec:
hostPath: /var/run/docker.sock
customImage: {{.kindNodeImage}}
---
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlane
metadata:
name: {{.clusterName}}
namespace: {{.eksaSystemNamespace}}
spec:
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: DockerMachineTemplate
name: {{.controlPlaneTemplateName}}
namespace: {{.eksaSystemNamespace}}
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: {{.controlPlaneTemplateName}}
namespace: {{.eksaSystemNamespace}}
kubeadmConfigSpec:
clusterConfiguration:
imageRepository: {{.kubernetesRepository}}
Expand All @@ -78,7 +79,6 @@ spec:
{{- end }}
{{- end }}
dns:
type: CoreDNS
imageRepository: {{.corednsRepository}}
imageTag: {{.corednsVersion}}
apiServer:
Expand Down Expand Up @@ -218,7 +218,7 @@ spec:
{{- if .externalEtcd }}
---
kind: EtcdadmCluster
apiVersion: etcdcluster.cluster.x-k8s.io/v1alpha3
apiVersion: etcdcluster.cluster.x-k8s.io/v1beta1
metadata:
name: {{.clusterName}}-etcd
namespace: {{.eksaSystemNamespace}}
Expand All @@ -232,12 +232,12 @@ spec:
cipherSuites: {{.etcdCipherSuites}}
{{- end }}
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: {{.etcdTemplateName}}
namespace: {{.eksaSystemNamespace}}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: {{.etcdTemplateName}}
Expand Down
10 changes: 5 additions & 5 deletions pkg/providers/docker/config/template-md.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
metadata:
name: {{.clusterName}}-md-0
Expand All @@ -16,7 +16,7 @@ spec:
{{ .kubeletExtraArgs.ToYaml | indent 12 }}
{{- end }}
---
apiVersion: cluster.x-k8s.io/v1alpha3
apiVersion: cluster.x-k8s.io/v1beta1
kind: MachineDeployment
metadata:
name: {{.clusterName}}-md-0
Expand All @@ -30,19 +30,19 @@ spec:
spec:
bootstrap:
configRef:
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
name: {{.clusterName}}-md-0
namespace: {{.eksaSystemNamespace}}
clusterName: {{.clusterName}}
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: {{.workloadTemplateName}}
namespace: {{.eksaSystemNamespace}}
version: {{.kubernetesVersion}}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: {{.workloadTemplateName}}
Expand Down
32 changes: 16 additions & 16 deletions pkg/providers/docker/testdata/capd_valid_full_oidc_cp_expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cluster.x-k8s.io/v1alpha3
apiVersion: cluster.x-k8s.io/v1beta1
kind: Cluster
metadata:
name: test-cluster
Expand All @@ -11,28 +11,28 @@ spec:
services:
cidrBlocks: [10.128.0.0/12]
controlPlaneRef:
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlane
name: test-cluster
namespace: eksa-system
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerCluster
name: test-cluster
namespace: eksa-system
managedExternalEtcdRef:
apiVersion: etcdcluster.cluster.x-k8s.io/v1alpha3
apiVersion: etcdcluster.cluster.x-k8s.io/v1beta1
kind: EtcdadmCluster
name: test-cluster-etcd
namespace: eksa-system
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerCluster
metadata:
name: test-cluster
namespace: eksa-system
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: test-cluster-control-plane-template-1234567890000
Expand All @@ -45,17 +45,18 @@ spec:
hostPath: /var/run/docker.sock
customImage: public.ecr.aws/eks-distro/kubernetes-sigs/kind/node:v1.18.16-eks-1-18-4-216edda697a37f8bf16651af6c23b7e2bb7ef42f-62681885fe3a97ee4f2b110cc277e084e71230fa
---
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlane
metadata:
name: test-cluster
namespace: eksa-system
spec:
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: DockerMachineTemplate
name: test-cluster-control-plane-template-1234567890000
namespace: eksa-system
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: test-cluster-control-plane-template-1234567890000
namespace: eksa-system
kubeadmConfigSpec:
clusterConfiguration:
imageRepository: public.ecr.aws/eks-distro/kubernetes
Expand All @@ -66,7 +67,6 @@ spec:
certFile: "/etc/kubernetes/pki/apiserver-etcd-client.crt"
keyFile: "/etc/kubernetes/pki/apiserver-etcd-client.key"
dns:
type: CoreDNS
imageRepository: public.ecr.aws/eks-distro/coredns
imageTag: v1.8.0-eks-1-19-2
apiServer:
Expand Down Expand Up @@ -287,7 +287,7 @@ spec:
version: v1.19.6-eks-1-19-2
---
kind: EtcdadmCluster
apiVersion: etcdcluster.cluster.x-k8s.io/v1alpha3
apiVersion: etcdcluster.cluster.x-k8s.io/v1beta1
metadata:
name: test-cluster-etcd
namespace: eksa-system
Expand All @@ -299,12 +299,12 @@ spec:
version: 3.4.14
cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: test-cluster-etcd-template-1234567890000
namespace: eksa-system
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: test-cluster-etcd-template-1234567890000
Expand Down
10 changes: 5 additions & 5 deletions pkg/providers/docker/testdata/capd_valid_full_oidc_md_expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
metadata:
name: test-cluster-md-0
Expand All @@ -14,7 +14,7 @@ spec:
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
tls-cipher-suites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
---
apiVersion: cluster.x-k8s.io/v1alpha3
apiVersion: cluster.x-k8s.io/v1beta1
kind: MachineDeployment
metadata:
name: test-cluster-md-0
Expand All @@ -28,19 +28,19 @@ spec:
spec:
bootstrap:
configRef:
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
name: test-cluster-md-0
namespace: eksa-system
clusterName: test-cluster
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: test-cluster-worker-node-template-1234567890000
namespace: eksa-system
version: v1.19.6-eks-1-19-2
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: test-cluster-worker-node-template-1234567890000
Expand Down
32 changes: 16 additions & 16 deletions pkg/providers/docker/testdata/capd_valid_minimal_oidc_cp_expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cluster.x-k8s.io/v1alpha3
apiVersion: cluster.x-k8s.io/v1beta1
kind: Cluster
metadata:
name: test-cluster
Expand All @@ -11,28 +11,28 @@ spec:
services:
cidrBlocks: [10.128.0.0/12]
controlPlaneRef:
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlane
name: test-cluster
namespace: eksa-system
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerCluster
name: test-cluster
namespace: eksa-system
managedExternalEtcdRef:
apiVersion: etcdcluster.cluster.x-k8s.io/v1alpha3
apiVersion: etcdcluster.cluster.x-k8s.io/v1beta1
kind: EtcdadmCluster
name: test-cluster-etcd
namespace: eksa-system
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerCluster
metadata:
name: test-cluster
namespace: eksa-system
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: test-cluster-control-plane-template-1234567890000
Expand All @@ -45,17 +45,18 @@ spec:
hostPath: /var/run/docker.sock
customImage: public.ecr.aws/eks-distro/kubernetes-sigs/kind/node:v1.18.16-eks-1-18-4-216edda697a37f8bf16651af6c23b7e2bb7ef42f-62681885fe3a97ee4f2b110cc277e084e71230fa
---
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlane
metadata:
name: test-cluster
namespace: eksa-system
spec:
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: DockerMachineTemplate
name: test-cluster-control-plane-template-1234567890000
namespace: eksa-system
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: test-cluster-control-plane-template-1234567890000
namespace: eksa-system
kubeadmConfigSpec:
clusterConfiguration:
imageRepository: public.ecr.aws/eks-distro/kubernetes
Expand All @@ -66,7 +67,6 @@ spec:
certFile: "/etc/kubernetes/pki/apiserver-etcd-client.crt"
keyFile: "/etc/kubernetes/pki/apiserver-etcd-client.key"
dns:
type: CoreDNS
imageRepository: public.ecr.aws/eks-distro/coredns
imageTag: v1.8.0-eks-1-19-2
apiServer:
Expand Down Expand Up @@ -282,7 +282,7 @@ spec:
version: v1.19.6-eks-1-19-2
---
kind: EtcdadmCluster
apiVersion: etcdcluster.cluster.x-k8s.io/v1alpha3
apiVersion: etcdcluster.cluster.x-k8s.io/v1beta1
metadata:
name: test-cluster-etcd
namespace: eksa-system
Expand All @@ -294,12 +294,12 @@ spec:
version: 3.4.14
cipherSuites: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
name: test-cluster-etcd-template-1234567890000
namespace: eksa-system
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: DockerMachineTemplate
metadata:
name: test-cluster-etcd-template-1234567890000
Expand Down
Loading