Align Treasuremap to recent changes of Airshipctl

* Changes from following PS are used to align treasuremap with airshipctl
   https://review.opendev.org/c/airship/airshipctl/+/790791
   https://review.opendev.org/c/airship/airshipctl/+/787290

Closes: #159

Change-Id: I43b633b06addaf65b6b5f945782df032cabf114c
This commit is contained in:
Sirajudeen 2021-05-28 21:05:37 +00:00
parent 6d26fe9aec
commit 49f02e6be4
7 changed files with 11 additions and 7 deletions

View File

@ -2,3 +2,4 @@ resources:
- helmrelease.yaml - helmrelease.yaml
- helmrepository.yaml - helmrepository.yaml
- namespace.yaml - namespace.yaml
namespace: ingress

View File

@ -3,5 +3,4 @@ resources:
- ../catalogues - ../catalogues
transformers: transformers:
- ../../../../type/airship-core/target/initinfra/replacements - ../../../../type/airship-core/target/initinfra/replacements
- ../../../../../../airshipctl/manifests/function/flux/source-controller/replacements - ../../../../../../airshipctl/manifests/composite/flux-helm/replacements
- ../../../../../../airshipctl/manifests/function/flux/helm-controller/replacements

View File

@ -1,4 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ../catalogues
- ../../../../function/workers-capm3
- nodes - nodes
transformers:
- ../../../../function/workers-capm3/replacements

View File

@ -5,4 +5,4 @@ generators:
- ../hostgenerator - ../hostgenerator
commonLabels: commonLabels:
airshipit.org/k8s-role: controlplane-host airshipit.org/k8s-role: worker

View File

@ -89,12 +89,12 @@
ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}" ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}"
ephemeral_vm_memory_mb: 6144 ephemeral_vm_memory_mb: 6144
ephemeral_vm_vcpus: 4 ephemeral_vm_vcpus: 4
target_disk_size: 20G target_disk_size: 25G
target_vm_cfg: "{{ target_vm_cfg }}" target_vm_cfg: "{{ target_vm_cfg }}"
target_vm_memory_mb: 7168 target_vm_memory_mb: 7168
target_vm_vcpus: 2 target_vm_vcpus: 2
target_vms_count: 1 target_vms_count: 1
worker_disk_size: 20G worker_disk_size: 30G
worker_vm_cfg: "{{ worker_vm_cfg }}" worker_vm_cfg: "{{ worker_vm_cfg }}"
worker_vm_memory_mb: 7168 worker_vm_memory_mb: 7168
worker_vm_vcpus: 2 worker_vm_vcpus: 2

View File

@ -47,7 +47,7 @@
- job: - job:
name: airship-treasuremap-deploy-test-site name: airship-treasuremap-deploy-test-site
attempts: 1 attempts: 1
timeout: 9500 timeout: 10800
required-projects: required-projects:
- airship/airshipctl - airship/airshipctl
roles: roles:

View File

@ -14,7 +14,7 @@
vars: vars:
# NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin # NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin
# the cloned version of airshipctl to a known/compatible reference. # the cloned version of airshipctl to a known/compatible reference.
AIRSHIPCTL_REF: "e12b1e2fa639e02a54cb982d372dcdd8e3ee39de" AIRSHIPCTL_REF: "c7d65d4114bf0f97bfbce3f02b6bf3d80d5ffe3e"
sphinx_build_dir: docs/build sphinx_build_dir: docs/build
check: check:
jobs: jobs: