Change ImagePullPolicy;Update tty console message;Sanitize user input;Add missing vapp property
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
e7d89006fc
commit
ca51303602
@ -27,7 +27,7 @@
|
||||
chdir: /opt/metacluster/k3s
|
||||
environment:
|
||||
INSTALL_K3S_SKIP_DOWNLOAD: 'true'
|
||||
INSTALL_K3S_EXEC: "server --cluster-init --token {{ vapp['metacluster.token'] }} --tls-san {{ vapp['metacluster.vip'] }} --disable local-storage --config /etc/rancher/k3s/config.yaml"
|
||||
INSTALL_K3S_EXEC: "server --cluster-init --token {{ vapp['metacluster.token'] | trim }} --tls-san {{ vapp['metacluster.vip'] }} --disable local-storage --config /etc/rancher/k3s/config.yaml"
|
||||
when: ansible_facts.services['k3s.service'] is undefined
|
||||
|
||||
- name: Debug possible taints on k3s node
|
||||
|
@ -19,7 +19,7 @@
|
||||
content: |
|
||||
{{ lookup('ansible.builtin.file', '/opt/metacluster/kube-vip/rbac.yaml') }}
|
||||
---
|
||||
{{ kubevip_manifest.stdout }}
|
||||
{{ kubevip_manifest.stdout | replace('imagePullPolicy: Always', 'imagePullPolicy: IfNotPresent') }}
|
||||
notify:
|
||||
- Apply manifests
|
||||
|
||||
|
@ -18,6 +18,9 @@
|
||||
name: ttyConsoleMessage
|
||||
executable: /opt/firstboot/tty.sh
|
||||
workingdir: /tmp/
|
||||
metacluster:
|
||||
fqdn: "{{ vapp['metacluster.fqdn'] }}"
|
||||
vip: "{{ vapp['metacluster.vip'] }}"
|
||||
loop:
|
||||
- src: tty.j2
|
||||
dest: "{{ _template.service.executable }}"
|
||||
|
@ -13,9 +13,9 @@ LCLR='\033[K' # Clear to end of line
|
||||
PRST='\033[0;0H' # Reset cursor position
|
||||
|
||||
# COMPONENTS=('ca' 'ingress' 'storage' 'registry' 'git' 'gitops')
|
||||
COMPONENTS=('ca' 'storage' 'registry' 'git' 'gitops')
|
||||
FQDN='{{ vapp['metacluster.fqdn'] }}'
|
||||
IPADDRESS='{{ vapp['guestinfo.ipaddress'] }}'
|
||||
COMPONENTS=('storage' 'registry' 'git' 'gitops')
|
||||
FQDN='{{ _template.metacluster.fqdn }}'
|
||||
IPADDRESS='{{ _template.metacluster.vip }}'
|
||||
|
||||
I=60
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
chdir: /opt/metacluster/k3s
|
||||
environment:
|
||||
INSTALL_K3S_SKIP_DOWNLOAD: 'true'
|
||||
INSTALL_K3S_EXEC: "server --token {{ vapp['metacluster.token'] }} --server https://{{ vapp['metacluster.fqdn'] }}:6443 --disable local-storage --config /etc/rancher/k3s/config.yaml"
|
||||
INSTALL_K3S_EXEC: "server --token {{ vapp['metacluster.token'] | trim }} --server https://{{ vapp['metacluster.fqdn'] }}:6443 --disable local-storage --config /etc/rancher/k3s/config.yaml"
|
||||
when: ansible_facts.services['k3s.service'] is undefined
|
||||
|
||||
- name: Ensure API availability
|
||||
|
@ -12,10 +12,18 @@ PropertyCategories:
|
||||
- Name: 1) Existing meta-cluster
|
||||
ProductProperties:
|
||||
|
||||
- Key: metacluster.vip
|
||||
- Key: metacluster.fqdn
|
||||
Type: string(1..)
|
||||
Label: Meta-cluster FQDN/IP-address*
|
||||
Description: The address of the target meta-cluster which this appliance will perform an upgrade on.
|
||||
Label: Meta-cluster FQDN*
|
||||
Description: The FQDN of the target meta-cluster which this appliance will perform an upgrade on.
|
||||
DefaultValue: meta.k8s.cluster
|
||||
Configurations: '*'
|
||||
UserConfigurable: true
|
||||
|
||||
- key: metacluster.vip
|
||||
Type: ip
|
||||
Label: Meta-cluster virtual IP*
|
||||
Description: Meta-cluster control plane endpoint virtual IP
|
||||
DefaultValue: ''
|
||||
Configurations: '*'
|
||||
UserConfigurable: true
|
||||
|
Loading…
Reference in New Issue
Block a user