diff --git a/manifests/function/workers-capm3/kubeadmconfigtemplate.yaml b/manifests/function/workers-capm3/kubeadmconfigtemplate.yaml deleted file mode 100644 index 2e79b57f1..000000000 --- a/manifests/function/workers-capm3/kubeadmconfigtemplate.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3 -kind: KubeadmConfigTemplate -metadata: - name: worker-1 -spec: - template: - spec: - joinConfiguration: - nodeRegistration: - name: '{{ ds.meta_data.name }}' - kubeletExtraArgs: - node-labels: 'metal3.io/uuid={{ ds.meta_data.uuid }},node-type=worker' - provider-id: 'metal3://{{ ds.meta_data.uuid }}' - feature-gates: "IPv6DualStack=true" - files: - - path: "/etc/systemd/system/docker.service.d/http-proxy.conf" - content: | - [Service] - Environment="HTTP_PROXY=REPLACEMENT_HTTP_PROXY" - Environment="HTTPS_PROXY=REPLACEMENT_HTTPS_PROXY" - Environment="NO_PROXY=REPLACEMENT_NO_PROXY" - preKubeadmCommands: - # Restart docker to apply any proxy settings - - export HOME=/root - - systemctl daemon-reload - - systemctl restart docker - users: - - name: deployer - sshAuthorizedKeys: - - REPLACE_HOST_SSH_KEY - sudo: ALL=(ALL) NOPASSWD:ALL diff --git a/manifests/function/workers-capm3/kustomization.yaml b/manifests/function/workers-capm3/kustomization.yaml deleted file mode 100644 index 3972ba58c..000000000 --- a/manifests/function/workers-capm3/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -resources: - - namespace.yaml - - kubeadmconfigtemplate.yaml - - machinedeployment.yaml - - metal3machinetemplate.yaml - -namespace: target-infra diff --git a/manifests/function/workers-capm3/machinedeployment.yaml b/manifests/function/workers-capm3/machinedeployment.yaml deleted file mode 100644 index e9687d8ee..000000000 --- a/manifests/function/workers-capm3/machinedeployment.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: cluster.x-k8s.io/v1alpha3 -kind: MachineDeployment -metadata: - name: worker-1 - labels: - cluster.x-k8s.io/cluster-name: target-cluster -spec: - clusterName: target-cluster - replicas: 1 - selector: - matchLabels: - cluster.x-k8s.io/cluster-name: target-cluster - template: - metadata: - labels: - cluster.x-k8s.io/cluster-name: target-cluster - spec: - clusterName: target-cluster - version: v1.18.3 - bootstrap: - configRef: - name: worker-1 - apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3 - kind: KubeadmConfigTemplate - infrastructureRef: - name: worker-1 - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 - kind: Metal3MachineTemplate ---- diff --git a/manifests/function/workers-capm3/metal3machinetemplate.yaml b/manifests/function/workers-capm3/metal3machinetemplate.yaml deleted file mode 100644 index fb7720b8f..000000000 --- a/manifests/function/workers-capm3/metal3machinetemplate.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 -kind: Metal3MachineTemplate -metadata: - name: worker-1 -spec: - template: - spec: - image: - url: http://REPLACEMENT_PROVISIONING_IP:80/images/data-plane.qcow2 - checksum: http://REPLACEMENT_PROVISIONING_IP:80/images/data-plane.qcow2.md5sum diff --git a/manifests/function/workers-capm3/namespace.yaml b/manifests/function/workers-capm3/namespace.yaml deleted file mode 100644 index b32028483..000000000 --- a/manifests/function/workers-capm3/namespace.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: target-infra diff --git a/manifests/function/workers-capm3/replacements/kustomization.yaml b/manifests/function/workers-capm3/replacements/kustomization.yaml deleted file mode 100644 index 3b6ae1a2c..000000000 --- a/manifests/function/workers-capm3/replacements/kustomization.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - workers-env-vars.yaml - - metal3machinetemplate_vars.yaml diff --git a/manifests/function/workers-capm3/replacements/metal3machinetemplate_vars.yaml b/manifests/function/workers-capm3/replacements/metal3machinetemplate_vars.yaml deleted file mode 100644 index 50441c342..000000000 --- a/manifests/function/workers-capm3/replacements/metal3machinetemplate_vars.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# These rules inject env vars into the workers. -apiVersion: airshipit.org/v1alpha1 -kind: ReplacementTransformer -metadata: - name: metal3machientemplate-replacements - annotations: - config.kubernetes.io/function: |- - container: - image: localhost/replacement-transformer -replacements: -- source: - objref: - name: networking - fieldref: spec.ironic.provisioningIp - target: - objref: - kind: Metal3MachineTemplate - name: worker-1 - fieldrefs: - - "spec.template.spec.image.url%REPLACEMENT_PROVISIONING_IP%" - - "spec.template.spec.image.checksum%REPLACEMENT_PROVISIONING_IP%" diff --git a/manifests/function/workers-capm3/replacements/workers-env-vars.yaml b/manifests/function/workers-capm3/replacements/workers-env-vars.yaml deleted file mode 100644 index e7ce9b0ad..000000000 --- a/manifests/function/workers-capm3/replacements/workers-env-vars.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# These rules inject env vars into the workers. -apiVersion: airshipit.org/v1alpha1 -kind: ReplacementTransformer -metadata: - name: workers-env-vars-replacements - annotations: - config.kubernetes.io/function: |- - container: - image: localhost/replacement-transformer -replacements: -# Replace the proxy vars -- source: - objref: - name: env-vars-catalogue - fieldref: env.HTTP_PROXY - target: - objref: - kind: KubeadmConfigTemplate - name: worker-1 - fieldrefs: - - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTP_PROXY%" -- source: - objref: - name: env-vars-catalogue - fieldref: env.HTTPS_PROXY - target: - objref: - kind: KubeadmConfigTemplate - name: worker-1 - fieldrefs: - - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTPS_PROXY%" -- source: - objref: - name: env-vars-catalogue - fieldref: env.NO_PROXY - target: - objref: - kind: KubeadmConfigTemplate - name: worker-1 - fieldrefs: - - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_NO_PROXY%" diff --git a/manifests/site/virtual-multi-tenant/target/workers/provision/kustomization.yaml b/manifests/site/virtual-multi-tenant/target/workers/provision/kustomization.yaml index b5103b4f9..ea03408b0 100644 --- a/manifests/site/virtual-multi-tenant/target/workers/provision/kustomization.yaml +++ b/manifests/site/virtual-multi-tenant/target/workers/provision/kustomization.yaml @@ -6,4 +6,4 @@ resources: transformers: - ../../../../../function/workers-vm-infra/replacements - - ../../../../../function/workers-capm3/replacements + - ../../../../../../../airshipctl/manifests/function/workers-capm3/replacements