Merge "Update KubeadmConfigTemplate reference to use airshipctl"
This commit is contained in:
commit
6b349afb94
|
@ -2,3 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
resources:
|
resources:
|
||||||
- nodes
|
- nodes
|
||||||
|
- ../../../../type/airship-core/target/workers
|
||||||
|
- ../catalogues
|
||||||
|
transformers:
|
||||||
|
- ../../../../type/airship-core/target/workers/replacements
|
|
@ -1,20 +0,0 @@
|
||||||
# These rules inject env vars into the workers.
|
|
||||||
apiVersion: airshipit.org/v1alpha1
|
|
||||||
kind: ReplacementTransformer
|
|
||||||
metadata:
|
|
||||||
name: workers-generated-secret-replacements
|
|
||||||
annotations:
|
|
||||||
config.kubernetes.io/function: |-
|
|
||||||
container:
|
|
||||||
image: localhost/replacement-transformer
|
|
||||||
replacements:
|
|
||||||
- source:
|
|
||||||
objref:
|
|
||||||
name: generated-secrets
|
|
||||||
fieldref: "{.sshKeys.publicKey}"
|
|
||||||
target:
|
|
||||||
objref:
|
|
||||||
kind: KubeadmConfigTemplate
|
|
||||||
name: worker-1
|
|
||||||
fieldrefs:
|
|
||||||
- "spec.template.spec.users[name=deployer].sshAuthorizedKeys[0]%REPLACE_HOST_SSH_KEY%"
|
|
|
@ -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,3 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
resources:
|
resources:
|
||||||
- nodes
|
- nodes
|
||||||
|
- ../../../../type/multi-tenant/target/workers
|
||||||
|
- ../catalogues
|
||||||
|
transformers:
|
||||||
|
- ../../../../type/airship-core/target/workers/replacements
|
|
@ -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
|
|
|
@ -1,10 +0,0 @@
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
resources:
|
|
||||||
- ../../catalogues
|
|
||||||
- kubeadmconfigtemplate.yaml
|
|
||||||
- metal3machinetemplate.yaml
|
|
||||||
- machinedeployment.yaml
|
|
||||||
|
|
||||||
transformers:
|
|
||||||
- ../replacements
|
|
|
@ -1,30 +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
|
|
||||||
## NEWSITE_CHANGEME: update the below with the total number of worker nodes
|
|
||||||
replicas: 2
|
|
||||||
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
|
|
||||||
---
|
|
|
@ -1,17 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
|
|
||||||
kind: Metal3MachineTemplate
|
|
||||||
metadata:
|
|
||||||
name: worker-1
|
|
||||||
spec:
|
|
||||||
template:
|
|
||||||
spec:
|
|
||||||
hostSelector:
|
|
||||||
matchLabels:
|
|
||||||
airshipit.org/k8s-role: worker
|
|
||||||
image:
|
|
||||||
## NEWSITE_CHANGEME: update the below ips with the first target node pxe ip
|
|
||||||
url: http://172.63.0.11/images/control-plane.qcow2
|
|
||||||
checksum: http://172.63.0.11/images/control-plane.qcow2.md5sum
|
|
||||||
|
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
# These rules inject env vars into the workers.
|
|
||||||
apiVersion: airshipit.org/v1alpha1
|
|
||||||
kind: ReplacementTransformer
|
|
||||||
metadata:
|
|
||||||
name: workers-generated-secret-replacements
|
|
||||||
annotations:
|
|
||||||
config.kubernetes.io/function: |-
|
|
||||||
container:
|
|
||||||
image: localhost/replacement-transformer
|
|
||||||
replacements:
|
|
||||||
- source:
|
|
||||||
objref:
|
|
||||||
name: generated-secrets
|
|
||||||
fieldref: "{.sshKeys.publicKey}"
|
|
||||||
target:
|
|
||||||
objref:
|
|
||||||
kind: KubeadmConfigTemplate
|
|
||||||
name: worker-1
|
|
||||||
fieldrefs:
|
|
||||||
- "spec.template.spec.users[name=deployer].sshAuthorizedKeys[0]%REPLACE_HOST_SSH_KEY%"
|
|
|
@ -1,5 +0,0 @@
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
resources:
|
|
||||||
- workers-env-vars.yaml
|
|
||||||
- generated-secrets.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,3 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
resources:
|
resources:
|
||||||
- nodes
|
- nodes
|
||||||
|
- ../../../../type/multi-tenant/target/workers
|
||||||
|
transformers:
|
||||||
|
- ../../../../type/multi-tenant/target/workers/replacements
|
|
@ -1,5 +1,4 @@
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
resources:
|
resources:
|
||||||
- workers-env-vars.yaml
|
- ../../../../../../airshipctl/manifests/function/workers-capm3
|
||||||
- generated-secrets.yaml
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
|
kind: Kustomization
|
||||||
|
resources:
|
||||||
|
- ../../../../../../../airshipctl/manifests/function/workers-capm3/replacements
|
||||||
|
- ../../../../../../../airshipctl/manifests/function/workers-capm3/replacements-secrets
|
Loading…
Reference in New Issue