From 3fd3ed9bfa9f97383b85c5115e583b109b4cfc4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=BCttler?= Date: Tue, 14 May 2024 14:59:29 +0200 Subject: [PATCH] :seedling: remove tilt-settings.json from comments. (#1310) This file is not used any more. --- .gitignore | 4 +--- Makefile | 17 ++++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f11c2f5d0..1fee81a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ @@ -33,7 +32,6 @@ test/e2e/data/infrastructure-hetzner/v1beta1/env* # Tilt files. .tiltbuild /tilt.d -tilt-settings.json tilt_config.json baremetalhosts.yaml @@ -74,4 +72,4 @@ __pycache__/ tmp_* # baremetal hosts -baremetalhosts*yaml \ No newline at end of file +baremetalhosts*yaml diff --git a/Makefile b/Makefile index cc921b054..b92bf23c2 100644 --- a/Makefile +++ b/Makefile @@ -225,9 +225,9 @@ env-vars-for-wl-cluster: @./hack/ensure-env-variables.sh CLUSTER_NAME CONTROL_PLANE_MACHINE_COUNT HCLOUD_CONTROL_PLANE_MACHINE_TYPE \ HCLOUD_REGION HCLOUD_SSH_KEY HCLOUD_WORKER_MACHINE_TYPE KUBERNETES_VERSION WORKER_MACHINE_COUNT -create-workload-cluster-hcloud: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) install-crds ## Creates a workload-cluster. ENV Variables need to be exported or defined in the tilt-settings.json +create-workload-cluster-hcloud: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) install-crds ## Creates a workload-cluster. # Create workload Cluster. - ./hack/ensure-env-variables.sh HCLOUD_TOKEN + ./hack/ensure-env-variables.sh HCLOUD_TOKEN $(KUBECTL) create secret generic $(INFRA_PROVIDER) --from-literal=hcloud=$(HCLOUD_TOKEN) --save-config --dry-run=client -o yaml | $(KUBECTL) apply -f - $(KUSTOMIZE) build templates/cluster-templates/hcloud --load-restrictor LoadRestrictionsNone > templates/cluster-templates/cluster-template-hcloud.yaml cat templates/cluster-templates/cluster-template-hcloud.yaml | $(ENVSUBST) - | $(KUBECTL) apply -f - @@ -235,7 +235,7 @@ create-workload-cluster-hcloud: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) $(MAKE) install-cilium-in-wl-cluster $(MAKE) install-ccm-in-wl-cluster PRIVATE_NETWORK=false -create-workload-cluster-hcloud-packer: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. ENV Variables need to be exported or defined in the tilt-settings.json +create-workload-cluster-hcloud-packer: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. # Create workload Cluster. ./hack/ensure-env-variables.sh HCLOUD_TOKEN $(KUBECTL) create secret generic $(INFRA_PROVIDER) --from-literal=hcloud=$(HCLOUD_TOKEN) --save-config --dry-run=client -o yaml | $(KUBECTL) apply -f - @@ -245,7 +245,7 @@ create-workload-cluster-hcloud-packer: env-vars-for-wl-cluster $(KUSTOMIZE) $(EN $(MAKE) install-cilium-in-wl-cluster $(MAKE) install-ccm-in-wl-cluster PRIVATE_NETWORK=false -create-workload-cluster-hcloud-network: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. ENV Variables need to be exported or defined in the tilt-settings.json +create-workload-cluster-hcloud-network: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. # Create workload Cluster. ./hack/ensure-env-variables.sh HCLOUD_TOKEN $(KUBECTL) create secret generic $(INFRA_PROVIDER) --from-literal=hcloud=$(HCLOUD_TOKEN) --save-config --dry-run=client -o yaml | $(KUBECTL) apply -f - @@ -255,7 +255,7 @@ create-workload-cluster-hcloud-network: env-vars-for-wl-cluster $(KUSTOMIZE) $(E $(MAKE) install-cilium-in-wl-cluster $(MAKE) install-ccm-in-wl-cluster PRIVATE_NETWORK=true -create-workload-cluster-hcloud-network-packer: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. ENV Variables need to be exported or defined in the tilt-settings.json +create-workload-cluster-hcloud-network-packer: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. # Create workload Cluster. ./hack/ensure-env-variables.sh HCLOUD_TOKEN $(KUBECTL) create secret generic $(INFRA_PROVIDER) --from-literal=hcloud=$(HCLOUD_TOKEN) --save-config --dry-run=client -o yaml | $(KUBECTL) apply -f - @@ -265,7 +265,7 @@ create-workload-cluster-hcloud-network-packer: env-vars-for-wl-cluster $(KUSTOMI $(MAKE) install-cilium-in-wl-cluster $(MAKE) install-ccm-in-wl-cluster PRIVATE_NETWORK=true -create-workload-cluster-hetzner-hcloud-control-plane: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. ENV Variables need to be exported or defined in the tilt-settings.json +create-workload-cluster-hetzner-hcloud-control-plane: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. # Create workload Cluster. ./hack/ensure-env-variables.sh HCLOUD_TOKEN HETZNER_ROBOT_USER HETZNER_ROBOT_PASSWORD HETZNER_SSH_PRIV_PATH HETZNER_SSH_PUB_PATH $(KUBECTL) create secret generic $(INFRA_PROVIDER) --from-literal=hcloud=$(HCLOUD_TOKEN) --from-literal=robot-user=$(HETZNER_ROBOT_USER) --from-literal=robot-password=$(HETZNER_ROBOT_PASSWORD) --save-config --dry-run=client -o yaml | $(KUBECTL) apply -f - @@ -276,7 +276,7 @@ create-workload-cluster-hetzner-hcloud-control-plane: env-vars-for-wl-cluster $( $(MAKE) install-cilium-in-wl-cluster $(MAKE) install-ccm-in-wl-cluster PRIVATE_NETWORK=false -create-workload-cluster-hetzner-baremetal-control-plane: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. ENV Variables need to be exported or defined in the tilt-settings.json +create-workload-cluster-hetzner-baremetal-control-plane: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. # Create workload Cluster. ./hack/ensure-env-variables.sh HCLOUD_TOKEN HETZNER_ROBOT_USER HETZNER_ROBOT_PASSWORD HETZNER_SSH_PRIV_PATH HETZNER_SSH_PUB_PATH $(KUBECTL) create secret generic $(INFRA_PROVIDER) --from-literal=hcloud=$(HCLOUD_TOKEN) --from-literal=robot-user=$(HETZNER_ROBOT_USER) --from-literal=robot-password=$(HETZNER_ROBOT_PASSWORD) --save-config --dry-run=client -o yaml | $(KUBECTL) apply -f - @@ -287,7 +287,7 @@ create-workload-cluster-hetzner-baremetal-control-plane: env-vars-for-wl-cluster $(MAKE) install-cilium-in-wl-cluster $(MAKE) install-ccm-in-wl-cluster PRIVATE_NETWORK=false -create-workload-cluster-hetzner-baremetal-control-plane-remediation: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. ENV Variables need to be exported or defined in the tilt-settings.json +create-workload-cluster-hetzner-baremetal-control-plane-remediation: env-vars-for-wl-cluster $(KUSTOMIZE) $(ENVSUBST) ## Creates a workload-cluster. # Create workload Cluster. ./hack/ensure-env-variables.sh HCLOUD_TOKEN HETZNER_ROBOT_USER HETZNER_ROBOT_PASSWORD HETZNER_SSH_PRIV_PATH HETZNER_SSH_PUB_PATH $(KUBECTL) create secret generic $(INFRA_PROVIDER) --from-literal=hcloud=$(HCLOUD_TOKEN) --from-literal=robot-user=$(HETZNER_ROBOT_USER) --from-literal=robot-password=$(HETZNER_ROBOT_PASSWORD) --save-config --dry-run=client -o yaml | $(KUBECTL) apply -f - @@ -802,4 +802,3 @@ create-hetzner-installimage-tgz: echo "tgz must contain only one directory. And it must be 'hetzner-installimage'."; \ exit 1; \ fi -