Add suffixes to metal3 objects

Metal3 objects will be deployed to the same namespace. This change adds suffixes to entrypoints with metal3 documents to avoid conflicts. In order to make replacement rules compatible with the suffix changes, some rules were patched while patches were updated to use more generic targets. Signed-off-by: Drew Walters <andrew.walters@att.com> Change-Id: I3ff6e8eeee784081ca7d7ed54e3951ef63e187ad
2021-06-22 15:00:47 +00:00 · 2021-06-22 15:00:47 +00:00 · 3d05e4699a
parent 415052eeab
commit 3d05e4699a
15 changed files with 42 additions and 19 deletions
--- a/manifests/function/k8scontrol-ha/kustomization.yaml
+++ b/manifests/function/k8scontrol-ha/kustomization.yaml
@ -5,21 +5,21 @@ resources:
  - ../../../../airshipctl/manifests/function/k8scontrol
  - dex-ca-cert-secret.yaml

-patchesStrategicMerge:
- oidc-apiserver-extra-args.yaml
-
 namespace: target-infra

-patchesJson6902:
+patches:
  - target:
      group: controlplane.cluster.x-k8s.io
      version: v1alpha3
      kind: KubeadmControlPlane
-      name: "cluster-controlplane"
    path: oidc-apiserver-ca-cert.json
  - target:
      group: controlplane.cluster.x-k8s.io
      version: v1alpha3
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    path:  vrrp_keepalived_patch.yaml
+  - target:
+      group: controlplane.cluster.x-k8s.io
+      version: v1alpha3
+      kind: KubeadmControlPlane
+    path: oidc-apiserver-extra-args.yaml
--- a/manifests/function/k8scontrol-ha/replacements/update-dex.yaml
+++ b/manifests/function/k8scontrol-ha/replacements/update-dex.yaml
@ -28,7 +28,6 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs: ["{.spec.kubeadmConfigSpec.clusterConfiguration.apiServer.extraArgs.oidc-issuer-url}"]
 # Dex client id, e.g., function-kubernetes
 - source:
@ -39,7 +38,6 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs: ["{.spec.kubeadmConfigSpec.clusterConfiguration.apiServer.extraArgs.oidc-client-id}"]
 # Dex hostname, e.g., dex.function.local
 - source:
@ -50,5 +48,4 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs: [".spec.kubeadmConfigSpec.clusterConfiguration.apiServer.certSANs[0]"]
--- a/manifests/type/multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml
@ -1,5 +1,7 @@
 resources:
  - ../../../../sub-cluster/controlplane

+nameSuffix: -lma
+
 patchesStrategicMerge:
  - patches/metal3machinetemplate.yaml
--- a/manifests/type/multi-tenant/sub-clusters/lma/controlplane/replacements/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/lma/controlplane/replacements/kustomization.yaml
@ -1,2 +1,9 @@
 resources:
  - ../../../../../sub-cluster/controlplane/replacements
+patchesJson6902:
+  - target:
+      group: airshipit.org
+      version: v1alpha1
+      kind: ReplacementTransformer
+      name: k8scontrol-cluster-replacements
+    path: patches/cluster.json
--- a/manifests/type/multi-tenant/sub-clusters/lma/controlplane/replacements/patches/cluster.json
+++ b/manifests/type/multi-tenant/sub-clusters/lma/controlplane/replacements/patches/cluster.json
@ -0,0 +1,7 @@
+[
+  {
+    "op": "replace",
+    "path": "/replacements/0/target/objref/name",
+    "value": "target-cluster-ca-lma"
+  }
+]
--- a/manifests/type/multi-tenant/sub-clusters/lma/workers/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/lma/workers/kustomization.yaml
@ -4,6 +4,8 @@ resources:
 commonLabels:
  cluster.x-k8s.io/cluster-name: lma

+nameSuffix: -lma
+
 patchesStrategicMerge:
  - patches/machinedeployment.yaml
  - patches/metal3machinetemplate.yaml
--- a/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml
@ -1,5 +1,7 @@
 resources:
  - ../../../../sub-cluster/controlplane

+nameSuffix: -wordpress
+
 patchesStrategicMerge:
  - patches/metal3machinetemplate.yaml
--- a/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/replacements/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/replacements/kustomization.yaml
@ -1,2 +1,9 @@
 resources:
  - ../../../../../sub-cluster/controlplane/replacements
+patchesJson6902:
+  - target:
+      group: airshipit.org
+      version: v1alpha1
+      kind: ReplacementTransformer
+      name: k8scontrol-cluster-replacements
+    path: patches/cluster.json
--- a/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/replacements/patches/cluster.json
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/replacements/patches/cluster.json
@ -0,0 +1,7 @@
+[
+	{
+	  "op": "replace",
+	  "path": "/replacements/0/target/objref/name",
+	  "value": "target-cluster-ca-wordpress"
+	}
+]
--- a/manifests/type/multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml
@ -1,6 +1,8 @@
 resources:
  - ../../../../sub-cluster/workers

+nameSuffix: -wordpress
+
 patchesStrategicMerge:
  - patches/machinedeployment.yaml
  - patches/metal3machinetemplate.yaml
--- a/manifests/type/sub-cluster/controlplane/replacements/generated-secrets.yaml
+++ b/manifests/type/sub-cluster/controlplane/replacements/generated-secrets.yaml
@ -15,6 +15,5 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs:
      - "spec.kubeadmConfigSpec.users[name=deployer].sshAuthorizedKeys[0]%REPLACE_HOST_SSH_KEY%"
--- a/manifests/type/sub-cluster/controlplane/replacements/k8s-control-env-vars.yaml
+++ b/manifests/type/sub-cluster/controlplane/replacements/k8s-control-env-vars.yaml
@ -16,7 +16,6 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs:
      - "spec.kubeadmConfigSpec.preKubeadmCommands%REPLACEMENT_HTTP_PROXY%"
      - "{.spec.kubeadmConfigSpec.files[:].content}%REPLACEMENT_HTTP_PROXY%"
@ -27,7 +26,6 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs:
      - "spec.kubeadmConfigSpec.preKubeadmCommands%REPLACEMENT_HTTPS_PROXY%"
      - "{.spec.kubeadmConfigSpec.files[:].content}%REPLACEMENT_HTTPS_PROXY%"
@ -38,7 +36,6 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs:
      - "spec.kubeadmConfigSpec.preKubeadmCommands%REPLACEMENT_NO_PROXY%"
      - "{.spec.kubeadmConfigSpec.files[:].content}%REPLACEMENT_NO_PROXY%"
--- a/manifests/type/sub-cluster/controlplane/replacements/versions.yaml
+++ b/manifests/type/sub-cluster/controlplane/replacements/versions.yaml
@ -17,7 +17,6 @@ replacements:
  target:
    objref:
      kind: KubeadmControlPlane
-      name: cluster-controlplane
    fieldrefs: ["{.spec.version}"]
 # Replace the controlplane disk image in the Metal3MachineTemplate
 - source:
@ -28,5 +27,4 @@ replacements:
  target:
    objref:
      kind: Metal3MachineTemplate
-      name: cluster-controlplane
    fieldrefs: ["{.spec.template.spec.image}"]
--- a/manifests/type/sub-cluster/workers/replacements/versions.yaml
+++ b/manifests/type/sub-cluster/workers/replacements/versions.yaml
@ -16,5 +16,4 @@ replacements:
  target:
    objref:
      kind: Metal3MachineTemplate
-      name: worker-1
    fieldrefs: ["{.spec.template.spec.image}"]
--- a/manifests/type/sub-cluster/workers/replacements/workers-env-vars.yaml
+++ b/manifests/type/sub-cluster/workers/replacements/workers-env-vars.yaml
@ -16,7 +16,6 @@ replacements:
  target:
    objref:
      kind: KubeadmConfigTemplate
-      name: worker-1
    fieldrefs:
      - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTP_PROXY%"
 - source:
@ -26,7 +25,6 @@ replacements:
  target:
    objref:
      kind: KubeadmConfigTemplate
-      name: worker-1
    fieldrefs:
      - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTPS_PROXY%"
 - source:
@ -36,6 +34,5 @@ replacements:
  target:
    objref:
      kind: KubeadmConfigTemplate
-      name: worker-1
    fieldrefs:
      - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_NO_PROXY%"