[uplift] - Uplift airshipctl to stable version

Airshipctl reference commits:

    => https://review.opendev.org/c/airship/airshipctl/+/792060
       Update metadata.yaml to kubernetes style

    => https://review.opendev.org/c/airship/airshipctl/+/793502
       Move CAPI resources to target-infra namespace

    => https://review.opendev.org/c/airship/airshipctl/+/789398
       Embed validation cfg into phase and plan definition

    => https://review.opendev.org/c/airship/airshipctl/+/794701
       Enable static validation for all available plans per site

    => https://review.opendev.org/c/airship/airshipctl/+/796574
       Decouple secret from other replacements in workers-capm3

    => https://review.opendev.org/c/airship/airshipctl/+/795167
       Added replacements for composite/infra

Change-Id: I2c107b3d2b94acda540b09792640dbafd55b23eb
This commit is contained in:
Sirajudeen 2021-06-09 21:35:52 +00:00
parent 65be6e300b
commit af84cc8c4e
30 changed files with 149 additions and 33 deletions

View File

@ -2,7 +2,6 @@ apiVersion: cert-manager.io/v1alpha2
kind: Issuer kind: Issuer
metadata: metadata:
name: workload-cluster-ca-issuer name: workload-cluster-ca-issuer
namespace: default
spec: spec:
ca: ca:
secretName: dex-apiserver-secret secretName: dex-apiserver-secret

View File

@ -1,6 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
namespace: target-infra
resources: resources:
- dex-helmrelease.yaml - dex-helmrelease.yaml
- dex-cert-issuer.yaml - dex-cert-issuer.yaml

View File

@ -8,6 +8,8 @@ resources:
patchesStrategicMerge: patchesStrategicMerge:
- oidc-apiserver-extra-args.yaml - oidc-apiserver-extra-args.yaml
namespace: target-infra
patchesJson6902: patchesJson6902:
- target: - target:
group: controlplane.cluster.x-k8s.io group: controlplane.cluster.x-k8s.io

View File

@ -1,4 +1,7 @@
resources: resources:
- namespace.yaml
- kubeadmconfigtemplate.yaml - kubeadmconfigtemplate.yaml
- machinedeployment.yaml - machinedeployment.yaml
- metal3machinetemplate.yaml - metal3machinetemplate.yaml
namespace: target-infra

View File

@ -0,0 +1,5 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: target-infra

View File

@ -20,3 +20,9 @@ status:
# when we have more flexible labeling system in place, we will not # when we have more flexible labeling system in place, we will not
# deliver this document to ephemeral cluster # deliver this document to ephemeral cluster
state: externally provisioned state: externally provisioned
ID: ""
operationHistory: {}
errorMessage: ""
hardwareProfile: ""
operationalStatus: ""
poweredOn: false

View File

@ -1,6 +1,11 @@
phase: apiVersion: airshipit.org/v1alpha1
docEntryPointPrefix: manifests/site/reference-airship-core kind: ManifestMetadata
path: manifests/site/reference-airship-core/phases metadata:
name: manifest-metadata
spec:
phase:
docEntryPointPrefix: manifests/site/reference-airship-core
path: manifests/site/reference-airship-core/phases
inventory: inventory:
path: manifests/site/reference-airship-core/host-inventory path: manifests/site/reference-airship-core/host-inventory

View File

@ -20,3 +20,9 @@ status:
# when we have more flexible labeling system in place, we will not # when we have more flexible labeling system in place, we will not
# deliver this document to ephemeral cluster # deliver this document to ephemeral cluster
state: externally provisioned state: externally provisioned
ID: ""
operationHistory: {}
errorMessage: ""
hardwareProfile: ""
operationalStatus: ""
poweredOn: false

View File

@ -1,6 +1,11 @@
phase: apiVersion: airshipit.org/v1alpha1
docEntryPointPrefix: manifests/site/reference-multi-tenant kind: ManifestMetadata
path: manifests/site/reference-multi-tenant/phases metadata:
name: manifest-metadata
spec:
phase:
docEntryPointPrefix: manifests/site/reference-multi-tenant
path: manifests/site/reference-multi-tenant/phases
inventory: inventory:
path: manifests/site/reference-multi-tenant/host-inventory path: manifests/site/reference-multi-tenant/host-inventory

View File

@ -18,3 +18,9 @@ status:
# when we have more flexible labeling system in place, we will not # when we have more flexible labeling system in place, we will not
# deliver this document to ephemeral cluster # deliver this document to ephemeral cluster
state: externally provisioned state: externally provisioned
ID: ""
operationHistory: {}
errorMessage: ""
hardwareProfile: ""
operationalStatus: ""
poweredOn: false

View File

@ -1,9 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- namespace.yaml
- ../../../../type/airship-core/ephemeral/bootstrap - ../../../../type/airship-core/ephemeral/bootstrap
- ../catalogues - ../catalogues
namespace: target-infra
generators: generators:
- hostgenerator - hostgenerator

View File

@ -0,0 +1,5 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: target-infra

View File

@ -6,5 +6,8 @@ resources:
# TODO (dukov) It's recocommended to upload BareMetalHost objects separately # TODO (dukov) It's recocommended to upload BareMetalHost objects separately
# otherwise nodes will hang in 'registering' state for quite a long time # otherwise nodes will hang in 'registering' state for quite a long time
- nodes - nodes
namespace: target-infra
transformers: transformers:
- ../../../../type/airship-core/ephemeral/controlplane/replacements - ../../../../type/airship-core/ephemeral/controlplane/replacements

View File

@ -1,2 +1,5 @@
resources: resources:
- ../catalogues
- ../../../../type/airship-core/ephemeral/initinfra-networking - ../../../../type/airship-core/ephemeral/initinfra-networking
transformers:
- ../../../../type/airship-core/ephemeral/initinfra-networking/replacements

View File

@ -1,6 +1,11 @@
phase: apiVersion: airshipit.org/v1alpha1
docEntryPointPrefix: manifests/site/test-site kind: ManifestMetadata
path: manifests/site/test-site/phases metadata:
name: manifest-metadata
spec:
phase:
docEntryPointPrefix: manifests/site/test-site
path: manifests/site/test-site/phases
inventory: inventory:
path: manifests/site/test-site/host-inventory path: manifests/site/test-site/host-inventory

View File

@ -1,6 +1,10 @@
resources: resources:
- ../kubeconfig - ../kubeconfig
- ../../../type/airship-core/phases - ../../../type/airship-core/phases
- ../target/catalogues
transformers:
- ../../../../../airshipctl/manifests/function/clusterctl/replacements
## TODO Consider making a catalogue combined with variable substitution instead ## TODO Consider making a catalogue combined with variable substitution instead
patchesStrategicMerge: patchesStrategicMerge:
- phase-patch.yaml - phase-patch.yaml

View File

@ -1,2 +1,7 @@
resources: resources:
- ../catalogues
- ../../../../type/airship-core/target/initinfra-networking - ../../../../type/airship-core/target/initinfra-networking
- namespace.yaml
transformers:
- ../../../../type/airship-core/target/initinfra-networking/replacements

View File

@ -0,0 +1,5 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: target-infra

View File

@ -4,5 +4,8 @@ resources:
- ../../../../type/airship-core/target/workers - ../../../../type/airship-core/target/workers
- ../catalogues - ../catalogues
- nodes - nodes
namespace: target-infra
transformers: transformers:
- ../../../../type/airship-core/target/workers/replacements - ../../../../type/airship-core/target/workers/replacements

View File

@ -18,3 +18,9 @@ status:
# when we have more flexible labeling system in place, we will not # when we have more flexible labeling system in place, we will not
# deliver this document to ephemeral cluster # deliver this document to ephemeral cluster
state: externally provisioned state: externally provisioned
ID: ""
operationHistory: {}
errorMessage: ""
hardwareProfile: ""
operationalStatus: ""
poweredOn: false

View File

@ -1,6 +1,11 @@
phase: apiVersion: airshipit.org/v1alpha1
docEntryPointPrefix: manifests/site/virtual-network-cloud kind: ManifestMetadata
path: manifests/site/virtual-network-cloud/phases metadata:
name: manifest-metadata
spec:
phase:
docEntryPointPrefix: manifests/site/virtual-network-cloud
path: manifests/site/virtual-network-cloud/phases
inventory: inventory:
path: manifests/site/virtual-network-cloud/host-inventory path: manifests/site/virtual-network-cloud/host-inventory

View File

@ -0,0 +1,2 @@
resources:
- ../../../../../../../airshipctl/manifests/composite/infra/replacements

View File

@ -1,3 +1,10 @@
phase: apiVersion: airshipit.org/v1alpha1
docEntryPointPrefix: manifests/type/airship-core kind: ManifestMetadata
path: manifests/type/airship-core/phases metadata:
name: manifest-metadata
spec:
phase:
docEntryPointPrefix: manifests/type/airship-core
path: manifests/type/airship-core/phases
inventory:
path: ""

View File

@ -1,11 +1,9 @@
resources: resources:
- ../../../../../airshipctl/manifests/phases/ - ../../../../../airshipctl/manifests/phases/
- lma-infra-target.yaml - lma-infra-target.yaml
- validation-config.yaml
- ../../../function/phase-helper/ - ../../../function/phase-helper/
- executors.yaml - executors.yaml
- phases.yaml - phases.yaml
transformers:
- ../../../../../airshipctl/manifests/function/validator
patchesStrategicMerge: patchesStrategicMerge:
- plan-patch.yaml - plan-patch.yaml

View File

@ -147,3 +147,20 @@ phases:
# - name: lma-stack # - name: lma-stack
# - name: lma-configs # - name: lma-configs
# - name: deliver-network-policy # - name: deliver-network-policy
validation:
kindsToSkip:
- Clusterctl
- VariableCatalogue
- StorageCatalogue
crdList:
- airshipctl/manifests/function/airshipctl-schemas
---
apiVersion: airshipit.org/v1alpha1
kind: PhasePlan
metadata:
name: iso
validation:
kindsToSkip:
- RemoteDirectConfiguration
- VariableCatalogue
- StorageCatalogue

View File

@ -0,0 +1,2 @@
resources:
- ../../../../../../../airshipctl/manifests/composite/infra/replacements

View File

@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ../../../../../../../airshipctl/manifests/function/workers-capm3/replacements - ../../../../../../../airshipctl/manifests/function/workers-capm3/replacements
- ../../../../../../../airshipctl/manifests/function/workers-capm3/replacements-secrets

View File

@ -6,8 +6,5 @@ resources:
- phases.yaml - phases.yaml
- executors.yaml - executors.yaml
- ../../../function/phase-helper - ../../../function/phase-helper
- validation-config.yaml
patchesStrategicMerge: patchesStrategicMerge:
- cluster_map_patch.yaml - cluster_map_patch.yaml
transformers:
- ../../../../../airshipctl/manifests/function/validator

View File

@ -25,5 +25,12 @@ export SITE_ROOTS=$SITE_ROOTS
export MANIFEST_REPO_URL=$MANIFEST_REPO_URL export MANIFEST_REPO_URL=$MANIFEST_REPO_URL
cd ${AIRSHIPCTL_PROJECT} cd ${AIRSHIPCTL_PROJECT}
./tools/validate_docs
# Validate only specific site if set
if [ ! -z "$1" ]; then
./tools/validate_docs $1
else
./tools/validate_docs
fi

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: "16da661959b69ae54be83266cf7db0920083a2d4" AIRSHIPCTL_REF: "1e8f31a160016a71c454507e529620e837efea78"
sphinx_build_dir: docs/build sphinx_build_dir: docs/build
check: check:
jobs: jobs: