[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
2021-06-09 21:35:52 +00:00 · 2021-06-09 21:35:52 +00:00 · e9310cf390
commit e9310cf390
parent fdcb0ca27d
28 changed files with 137 additions and 32 deletions
--- a/manifests/function/k8scontrol-ha/kustomization.yaml
+++ b/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
--- a/manifests/function/workers-capm3/kustomization.yaml
+++ b/manifests/function/workers-capm3/kustomization.yaml
@ -1,4 +1,7 @@
 resources:
+  - namespace.yaml
  - kubeadmconfigtemplate.yaml
  - machinedeployment.yaml
  - metal3machinetemplate.yaml
+
+namespace: target-infra
--- a/manifests/function/workers-capm3/namespace.yaml
+++ b/manifests/function/workers-capm3/namespace.yaml
@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: target-infra
--- a/manifests/site/reference-airship-core/metadata.yaml
+++ b/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
--- a/manifests/site/reference-multi-tenant/metadata.yaml
+++ b/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
--- a/manifests/site/test-site/ephemeral/bootstrap/baremetalhost.yaml
+++ b/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
--- a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
+++ b/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

--- a/manifests/site/test-site/ephemeral/bootstrap/namespace.yaml
+++ b/manifests/site/test-site/ephemeral/bootstrap/namespace.yaml
@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: target-infra
--- a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
+++ b/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
--- a/manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml
+++ b/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
--- a/manifests/site/test-site/metadata.yaml
+++ b/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
--- a/manifests/site/test-site/phases/kustomization.yaml
+++ b/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
--- a/manifests/site/test-site/target/initinfra-networking/kustomization.yaml
+++ b/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
--- a/manifests/site/test-site/target/initinfra-networking/namespace.yaml
+++ b/manifests/site/test-site/target/initinfra-networking/namespace.yaml
@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: target-infra
--- a/manifests/site/test-site/target/workers/kustomization.yaml
+++ b/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
--- a/manifests/site/virtual-network-cloud/metadata.yaml
+++ b/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
--- a/manifests/type/airship-core/ephemeral/initinfra-networking/replacements/kustomization.yaml
+++ b/manifests/type/airship-core/ephemeral/initinfra-networking/replacements/kustomization.yaml
@ -0,0 +1,2 @@
+resources:
+  - ../../../../../../../airshipctl/manifests/composite/infra/replacements
--- a/manifests/type/airship-core/metadata.yaml
+++ b/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: ""
--- a/manifests/type/airship-core/phases/kustomization.yaml
+++ b/manifests/type/airship-core/phases/kustomization.yaml
@ -1,10 +1,11 @@
 resources:
  - ../../../../../airshipctl/manifests/phases/
  - lma-infra-target.yaml
-  - validation-config.yaml
  - ../../../function/phase-helper/
  - executors.yaml
  - phases.yaml
  - plan.yaml
-transformers:
-  - ../../../../../airshipctl/manifests/function/validator
+
+patchesStrategicMerge:
+   - patches/delete-deploy-gating.yaml
+   - plan-patch.yaml
--- a/manifests/type/airship-core/phases/patches/delete-deploy-gating.yaml
+++ b/manifests/type/airship-core/phases/patches/delete-deploy-gating.yaml
@ -0,0 +1,5 @@
+$patch: delete
+apiVersion: airshipit.org/v1alpha1
+kind: PhasePlan
+metadata:
+  name: deploy-gating
--- a/manifests/type/airship-core/phases/plan-patch.yaml
+++ b/manifests/type/airship-core/phases/plan-patch.yaml
@ -0,0 +1,10 @@
+apiVersion: airshipit.org/v1alpha1
+kind: PhasePlan
+metadata:
+  name: iso
+validation:
+  kindsToSkip:
+    - RemoteDirectConfiguration
+    - VariableCatalogue
+    - StorageCatalogue
+    - BareMetalHost
--- a/manifests/type/airship-core/phases/plan.yaml
+++ b/manifests/type/airship-core/phases/plan.yaml
@ -147,3 +147,10 @@ phases:
  # - name: lma-stack
  # - name: lma-configs
  # - name: deliver-network-policy
+validation:
+ kindsToSkip:
+   - Clusterctl
+   - VariableCatalogue
+   - StorageCatalogue
+ crdList:
+   - airshipctl/manifests/function/airshipctl-schemas
--- a/manifests/type/airship-core/target/initinfra-networking/replacements/kustomization.yaml
+++ b/manifests/type/airship-core/target/initinfra-networking/replacements/kustomization.yaml
@ -0,0 +1,2 @@
+resources:
+  - ../../../../../../../airshipctl/manifests/composite/infra/replacements
--- a/manifests/type/airship-core/target/workers/replacements/kustomization.yaml
+++ b/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
--- a/manifests/type/multi-tenant/phases/kustomization.yaml
+++ b/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
--- a/tools/validate_docs
+++ b/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
+

--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@ -31,7 +31,7 @@
        - ./tools/deployment/common/21_systemwide_executable.sh
        - ./tools/deployment/common/22_test_configs.sh
        - ./tools/deployment/common/23_pull_documents.sh
-        - ./tools/validate_docs
+        - ./tools/validate_docs test-site  # validate only test-site till we get other site specific plans to work with document validation

 - job:
    name: treasuremap-upload-git-mirror
--- a/zuul.d/projects.yaml
+++ b/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: