Rename vapp property;Configure node for private registry

This commit is contained in:
Danny Bessems 2022-07-03 14:52:01 +02:00
parent 95dea97382
commit 2f937aded7
3 changed files with 16 additions and 5 deletions

View File

@ -69,7 +69,7 @@
defaultReplicaCount: 1 defaultReplicaCount: 1
ingress: ingress:
enabled: true enabled: true
host: storage.{{ vapp['guestinfo.fqdn'] }} host: storage.{{ vapp['metacluster.fqdn'] }}
persistence: persistence:
defaultClassReplicaCount: 1 defaultClassReplicaCount: 1
@ -85,8 +85,8 @@
expose: expose:
ingress: ingress:
hosts: hosts:
core: registry.{{ vapp['guestinfo.fqdn'] }} core: registry.{{ vapp['metacluster.fqdn'] }}
externalURL: https://registry.{{ vapp['guestinfo.fqdn'] }} externalURL: https://registry.{{ vapp['metacluster.fqdn'] }}
harborAdminPassword: "{{ vapp['guestinfo.rootpw'] }}" harborAdminPassword: "{{ vapp['guestinfo.rootpw'] }}"
notary: notary:
enabled: false enabled: false
@ -98,7 +98,7 @@
--dest-tls-verify=false \ --dest-tls-verify=false \
--dest-creds admin:{{ vapp['guestinfo.rootpw'] }} \ --dest-creds admin:{{ vapp['guestinfo.rootpw'] }} \
docker-archive:./{{ item }} \ docker-archive:./{{ item }} \
docker://registry.{{ vapp['guestinfo.fqdn'] }}/library/$( \ docker://registry.{{ vapp['metacluster.fqdn'] }}/library/$( \
k3s ctr run \ k3s ctr run \
--rm \ --rm \
--mount type=bind,src=$PWD,dst=/data,options=rbind:ro \ --mount type=bind,src=$PWD,dst=/data,options=rbind:ro \
@ -118,6 +118,11 @@
path: /opt/metacluster/container-images path: /opt/metacluster/container-images
state: absent state: absent
- name: Configure K3s node for private registry
ansible.builtin.template:
dest: /etc/rancher/k3s/registries.yaml
src: registries.j2
- name: Cleanup tempfile - name: Cleanup tempfile
ansible.builtin.file: ansible.builtin.file:
path: "{{ kubeconfig.path }}" path: "{{ kubeconfig.path }}"

View File

@ -0,0 +1,6 @@
mirrors:
docker.io:
endpoint:
- "https://registry.{{ vapp['metacluster.fqdn'] }}
rewrite:
"(.*)": "library/docker.io/$1"

View File

@ -35,7 +35,7 @@ PropertyCategories:
- Name: 1) Kubernetes - Name: 1) Kubernetes
ProductProperties: ProductProperties:
- Key: guestinfo.fqdn - Key: metacluster.fqdn
Type: string(1..) Type: string(1..)
Label: Appliance FQDN* Label: Appliance FQDN*
Description: 'Respective subdomains will be available for each component (e.g. storage.example.org); this address should already be configured as a wildcard record within your DNS zone.' Description: 'Respective subdomains will be available for each component (e.g. storage.example.org); this address should already be configured as a wildcard record within your DNS zone.'