Increase cpu sizing;Change default value;Fix filename;Fix endpoint;Add dependency;Fix filemode
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
81847d3b93
commit
44befeda4b
@ -157,6 +157,13 @@
|
|||||||
name: token_init_{{ lookup('password', '/dev/null length=5 chars=ascii_letters,digits') }}
|
name: token_init_{{ lookup('password', '/dev/null length=5 chars=ascii_letters,digits') }}
|
||||||
register: gitea_api_token
|
register: gitea_api_token
|
||||||
|
|
||||||
|
- name: Retrieve existing gitea configuration
|
||||||
|
ansible.builtin.uri:
|
||||||
|
# url: https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/orgs
|
||||||
|
url: https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/repos/search
|
||||||
|
method: GET
|
||||||
|
register: gitea_existing_config
|
||||||
|
|
||||||
- name: Create organization(s)
|
- name: Create organization(s)
|
||||||
ansible.builtin.uri:
|
ansible.builtin.uri:
|
||||||
url: https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/orgs
|
url: https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/orgs
|
||||||
@ -234,7 +241,7 @@
|
|||||||
|
|
||||||
- name: Generate argo-cd API token
|
- name: Generate argo-cd API token
|
||||||
ansible.builtin.uri:
|
ansible.builtin.uri:
|
||||||
url: https://gitops.{{ vapp['metacluster.fqdn'] }}/api/v1/account/admin/token
|
url: https://gitops.{{ vapp['metacluster.fqdn'] }}/api/v1/session
|
||||||
method: POST
|
method: POST
|
||||||
force_basic_auth: yes
|
force_basic_auth: yes
|
||||||
body:
|
body:
|
||||||
|
@ -7,14 +7,6 @@
|
|||||||
- /var/lib/rancher/k3s/server/manifests
|
- /var/lib/rancher/k3s/server/manifests
|
||||||
- /opt/metacluster/k3s
|
- /opt/metacluster/k3s
|
||||||
|
|
||||||
- name: Inject manifests
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: helmchartconfig.j2
|
|
||||||
dest: /var/lib/rancher/k3s/server/manifests/{{ item.name }}_config.yml
|
|
||||||
loop: "{{ platform.packaged_components }}"
|
|
||||||
loop_control:
|
|
||||||
label: "{{ item.name }}"
|
|
||||||
|
|
||||||
- name: Download & install K3s binary
|
- name: Download & install K3s binary
|
||||||
ansible.builtin.get_url:
|
ansible.builtin.get_url:
|
||||||
url: https://github.com/k3s-io/k3s/releases/download/{{ platform.k3s.version }}/k3s
|
url: https://github.com/k3s-io/k3s/releases/download/{{ platform.k3s.version }}/k3s
|
||||||
@ -35,3 +27,14 @@
|
|||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
mode: 0755
|
mode: 0755
|
||||||
|
|
||||||
|
- name: Inject manifests
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: helmchartconfig.j2
|
||||||
|
dest: /var/lib/rancher/k3s/server/manifests/{{ item.name }}-config.yaml
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: 0600
|
||||||
|
loop: "{{ platform.packaged_components }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.name }}"
|
||||||
|
@ -119,5 +119,6 @@ dependencies:
|
|||||||
|
|
||||||
packages:
|
packages:
|
||||||
- lvm2
|
- lvm2
|
||||||
|
- python3-jmespath
|
||||||
- python3-passlib
|
- python3-passlib
|
||||||
- skopeo
|
- skopeo
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
DeploymentConfigurations:
|
DeploymentConfigurations:
|
||||||
|
|
||||||
- Id: medium
|
- Id: small
|
||||||
Label: 'Ubuntu Server 22.04 [MEDIUM: 2 vCPU/4GB RAM]'
|
Label: 'Ubuntu Server 22.04 [SMALL: 2 vCPU/4GB RAM]'
|
||||||
Description: Ubuntu Server 22.04.x
|
Description: Ubuntu Server 22.04.x
|
||||||
Size:
|
Size:
|
||||||
CPU: 2
|
CPU: 2
|
||||||
Memory: 4096
|
Memory: 4096
|
||||||
|
|
||||||
- Id: large
|
- Id: medium
|
||||||
Label: 'Ubuntu Server 22.04 [LARGE: 2 vCPU/8GB RAM]'
|
Label: 'Ubuntu Server 22.04 [MEDIUM: 4 vCPU/8GB RAM]'
|
||||||
Description: Ubuntu Server 22.04.x
|
Description: Ubuntu Server 22.04.x
|
||||||
Size:
|
Size:
|
||||||
CPU: 2
|
CPU: 4
|
||||||
Memory: 8192
|
Memory: 8192
|
||||||
|
|
||||||
DynamicDisks:
|
DynamicDisks:
|
||||||
@ -29,17 +29,18 @@ PropertyCategories:
|
|||||||
# - Key: deployment.type
|
# - Key: deployment.type
|
||||||
# Type: string
|
# Type: string
|
||||||
# Value:
|
# Value:
|
||||||
|
# - small
|
||||||
# - medium
|
# - medium
|
||||||
# - large
|
|
||||||
# UserConfigurable: false
|
# UserConfigurable: false
|
||||||
|
|
||||||
- Name: 1) Kubernetes
|
- Name: 1) Kubernetes
|
||||||
ProductProperties:
|
ProductProperties:
|
||||||
|
|
||||||
- Key: metacluster.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.'
|
||||||
DefaultValue: 'example.org'
|
DefaultValue: 'meta.k8s.cluster'
|
||||||
Configurations: '*'
|
Configurations: '*'
|
||||||
UserConfigurable: true
|
UserConfigurable: true
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user