From ec91e1660951a2c102a4a300ae997a5b1d78fa1a Mon Sep 17 00:00:00 2001 From: Grigoriy Mikhalkin Date: Mon, 12 Jul 2021 20:11:35 +0200 Subject: [PATCH] upd cluster template --- api/v1alpha3/groupversion_info.go | 2 +- config/resources/crd/kustomization.yaml | 1 - templates/cluster-template.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/v1alpha3/groupversion_info.go b/api/v1alpha3/groupversion_info.go index fac9693b..2f23817e 100644 --- a/api/v1alpha3/groupversion_info.go +++ b/api/v1alpha3/groupversion_info.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1alpha4 contains API Schema definitions for the infrastructure v1alpha4 API group +// Package v1alpha3 contains API Schema definitions for the infrastructure v1alpha3 API group // +kubebuilder:object:generate=true // +groupName=infrastructure.cluster.x-k8s.io package v1alpha3 diff --git a/config/resources/crd/kustomization.yaml b/config/resources/crd/kustomization.yaml index 98b039e7..30061d28 100644 --- a/config/resources/crd/kustomization.yaml +++ b/config/resources/crd/kustomization.yaml @@ -2,7 +2,6 @@ # since it depends on service name and namespace that are out of this kustomize package. # It should be run by config/default commonLabels: - cluster.x-k8s.io/v1alpha3: v1alpha3 cluster.x-k8s.io/v1alpha4: v1alpha4 resources: diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index a4daf7d3..9f38e362 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -27,7 +27,7 @@ spec: - sudo apt-mark hold kubelet kubeadm kubectl - echo "preKubeadmCommands finished" postKubeadmCommands: - - sudo kubeadm init --config=/tmp/kubeadm.yaml --ignore-preflight-errors=NumCPU,Mem + - sudo kubeadm init --config /run/kubeadm/kubeadm.yaml --ignore-preflight-errors=NumCPU,Mem - sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml initConfiguration: localAPIEndpoint: