Browse Source

Merge "Remove treasuremap workers-capm3 function"

changes/21/807721/4
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
7b7abcbbec
  1. 31
      manifests/function/workers-capm3/kubeadmconfigtemplate.yaml
  2. 7
      manifests/function/workers-capm3/kustomization.yaml
  3. 29
      manifests/function/workers-capm3/machinedeployment.yaml
  4. 10
      manifests/function/workers-capm3/metal3machinetemplate.yaml
  5. 5
      manifests/function/workers-capm3/namespace.yaml
  6. 3
      manifests/function/workers-capm3/replacements/kustomization.yaml
  7. 21
      manifests/function/workers-capm3/replacements/metal3machinetemplate_vars.yaml
  8. 41
      manifests/function/workers-capm3/replacements/workers-env-vars.yaml
  9. 2
      manifests/site/virtual-multi-tenant/target/workers/provision/kustomization.yaml

31
manifests/function/workers-capm3/kubeadmconfigtemplate.yaml

@ -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

7
manifests/function/workers-capm3/kustomization.yaml

@ -1,7 +0,0 @@
resources:
- namespace.yaml
- kubeadmconfigtemplate.yaml
- machinedeployment.yaml
- metal3machinetemplate.yaml
namespace: target-infra

29
manifests/function/workers-capm3/machinedeployment.yaml

@ -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
---

10
manifests/function/workers-capm3/metal3machinetemplate.yaml

@ -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

5
manifests/function/workers-capm3/namespace.yaml

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

3
manifests/function/workers-capm3/replacements/kustomization.yaml

@ -1,3 +0,0 @@
resources:
- workers-env-vars.yaml
- metal3machinetemplate_vars.yaml

21
manifests/function/workers-capm3/replacements/metal3machinetemplate_vars.yaml

@ -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%"

41
manifests/function/workers-capm3/replacements/workers-env-vars.yaml

@ -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%"

2
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
Loading…
Cancel
Save