Browse Source

[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
changes/03/795703/37
Sirajudeen 4 months ago
parent
commit
af84cc8c4e
  1. 1
      manifests/function/dex-aio/dex-cert-issuer.yaml
  2. 2
      manifests/function/dex-aio/kustomization.yaml
  3. 2
      manifests/function/k8scontrol-ha/kustomization.yaml
  4. 3
      manifests/function/workers-capm3/kustomization.yaml
  5. 5
      manifests/function/workers-capm3/namespace.yaml
  6. 6
      manifests/site/reference-airship-core/ephemeral/bootstrap/baremetalhost.yaml
  7. 15
      manifests/site/reference-airship-core/metadata.yaml
  8. 6
      manifests/site/reference-multi-tenant/ephemeral/bootstrap/baremetalhost.yaml
  9. 15
      manifests/site/reference-multi-tenant/metadata.yaml
  10. 6
      manifests/site/test-site/ephemeral/bootstrap/baremetalhost.yaml
  11. 2
      manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
  12. 5
      manifests/site/test-site/ephemeral/bootstrap/namespace.yaml
  13. 3
      manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
  14. 3
      manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml
  15. 15
      manifests/site/test-site/metadata.yaml
  16. 4
      manifests/site/test-site/phases/kustomization.yaml
  17. 5
      manifests/site/test-site/target/initinfra-networking/kustomization.yaml
  18. 5
      manifests/site/test-site/target/initinfra-networking/namespace.yaml
  19. 3
      manifests/site/test-site/target/workers/kustomization.yaml
  20. 6
      manifests/site/virtual-network-cloud/ephemeral/bootstrap/baremetalhost.yaml
  21. 15
      manifests/site/virtual-network-cloud/metadata.yaml
  22. 2
      manifests/type/airship-core/ephemeral/initinfra-networking/replacements/kustomization.yaml
  23. 13
      manifests/type/airship-core/metadata.yaml
  24. 6
      manifests/type/airship-core/phases/kustomization.yaml
  25. 17
      manifests/type/airship-core/phases/plan-patch.yaml
  26. 2
      manifests/type/airship-core/target/initinfra-networking/replacements/kustomization.yaml
  27. 1
      manifests/type/airship-core/target/workers/replacements/kustomization.yaml
  28. 3
      manifests/type/multi-tenant/phases/kustomization.yaml
  29. 9
      tools/validate_docs
  30. 2
      zuul.d/projects.yaml

1
manifests/function/dex-aio/dex-cert-issuer.yaml

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

2
manifests/function/dex-aio/kustomization.yaml

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

2
manifests/function/k8scontrol-ha/kustomization.yaml

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

3
manifests/function/workers-capm3/kustomization.yaml

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

5
manifests/function/workers-capm3/namespace.yaml

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

6
manifests/site/reference-airship-core/ephemeral/bootstrap/baremetalhost.yaml

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

15
manifests/site/reference-airship-core/metadata.yaml

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

6
manifests/site/reference-multi-tenant/ephemeral/bootstrap/baremetalhost.yaml

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

15
manifests/site/reference-multi-tenant/metadata.yaml

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

6
manifests/site/test-site/ephemeral/bootstrap/baremetalhost.yaml

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

2
manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml

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

5
manifests/site/test-site/ephemeral/bootstrap/namespace.yaml

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

3
manifests/site/test-site/ephemeral/controlplane/kustomization.yaml

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

3
manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml

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

15
manifests/site/test-site/metadata.yaml

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

4
manifests/site/test-site/phases/kustomization.yaml

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

5
manifests/site/test-site/target/initinfra-networking/kustomization.yaml

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

5
manifests/site/test-site/target/initinfra-networking/namespace.yaml

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

3
manifests/site/test-site/target/workers/kustomization.yaml

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

6
manifests/site/virtual-network-cloud/ephemeral/bootstrap/baremetalhost.yaml

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

15
manifests/site/virtual-network-cloud/metadata.yaml

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

2
manifests/type/airship-core/ephemeral/initinfra-networking/replacements/kustomization.yaml

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

13
manifests/type/airship-core/metadata.yaml

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

6
manifests/type/airship-core/phases/kustomization.yaml

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

17
manifests/type/airship-core/phases/plan-patch.yaml

@ -147,3 +147,20 @@ phases:
# - name: lma-stack
# - name: lma-configs
# - 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

2
manifests/type/airship-core/target/initinfra-networking/replacements/kustomization.yaml

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

1
manifests/type/airship-core/target/workers/replacements/kustomization.yaml

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

3
manifests/type/multi-tenant/phases/kustomization.yaml

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

9
tools/validate_docs

@ -25,5 +25,12 @@ export SITE_ROOTS=$SITE_ROOTS
export MANIFEST_REPO_URL=$MANIFEST_REPO_URL
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

2
zuul.d/projects.yaml

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

Loading…
Cancel
Save