Change target cluster name for capo

Change target cluster name for capo provider from "ostgt" to "target-cluster" target cluster name was changed at below entrypoints: - manifests/function/k8scontrol-capo - manifests/function/workers-capo - manifests/site/openstack-test-site Change-Id: I36f115e4a5debfc9c0f7e47705c87de29cf14d80
2020-10-28 09:26:24 -04:00 · 2020-10-28 09:26:24 -04:00 · 646006986b
commit 646006986b
parent cd418a64dc
14 changed files with 33 additions and 33 deletions
--- a/manifests/function/k8scontrol-capo/cluster.yaml
+++ b/manifests/function/k8scontrol-capo/cluster.yaml
@ -1,7 +1,7 @@
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: Cluster
 metadata:
-  name: ostgt
+  name: target-cluster
  namespace: default
 spec:
  clusterNetwork:
@ -12,23 +12,23 @@ spec:
  controlPlaneRef:
    apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
    kind: KubeadmControlPlane
-    name: ostgt-control-plane
+    name: target-cluster-control-plane
  infrastructureRef:
    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
    kind: OpenStackCluster
-    name: ostgt
+    name: target-cluster
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackCluster
 metadata:
-  name: ostgt
+  name: target-cluster
  namespace: default
 spec:
  apiServerLoadBalancerFloatingIP: ${OPENSTACK_CONTROLPLANE_IP}
  apiServerLoadBalancerPort: 6443
  cloudName: devstack
  cloudsSecret:
-    name: ostgt-cloud-config
+    name: target-cluster-cloud-config
    namespace: default
  disablePortSecurity: false
  disableServerTags: true
@ -43,7 +43,7 @@ spec:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ostgt-cloud-config
+  name: target-cluster-cloud-config
  namespace: default
 data:
  cacert: ${CLOUD_CERT_B64}
--- a/manifests/function/k8scontrol-capo/controlplane.yaml
+++ b/manifests/function/k8scontrol-capo/controlplane.yaml
@ -1,13 +1,13 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
  namespace: default
 spec:
  infrastructureTemplate:
    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
    kind: OpenStackMachineTemplate
-    name: ostgt-control-plane
+    name: target-cluster-control-plane
  kubeadmConfigSpec:
    clusterConfiguration:
      apiServer:
@ -70,14 +70,14 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
  namespace: default
 spec:
  template:
    spec:
      cloudName: devstack
      cloudsSecret:
-        name: ostgt-cloud-config
+        name: target-cluster-cloud-config
        namespace: default
      flavor: ${CONTROLPLANE_MACHINE_FLAVOR}
      image: ubuntu-1910-kube-v1.17.3
--- a/manifests/function/workers-capo/workers.yaml
+++ b/manifests/function/workers-capo/workers.yaml
@ -1,10 +1,10 @@
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: MachineDeployment
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
  namespace: default
 spec:
-  clusterName: ostgt
+  clusterName: target-cluster
  replicas: 0
  selector:
    matchLabels: null
@ -14,26 +14,26 @@ spec:
        configRef:
          apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
          kind: KubeadmConfigTemplate
-          name: ostgt-md-0
-      clusterName: ostgt
+          name: target-cluster-md-0
+      clusterName: target-cluster
      failureDomain: nova
      infrastructureRef:
        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
        kind: OpenStackMachineTemplate
-        name: ostgt-md-0
+        name: target-cluster-md-0
      version: v1.17.3
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
  namespace: default
 spec:
  template:
    spec:
      cloudName: devstack
      cloudsSecret:
-        name: ostgt-cloud-config
+        name: target-cluster-cloud-config
        namespace: default
      flavor: ${WORKER_MACHINE_FLAVOR}
      image: ubuntu-1910-kube-v1.17.3
@ -41,7 +41,7 @@ spec:
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
  namespace: default
 spec:
  template:
--- a/manifests/site/openstack-test-site/target/controlplane/cluster_clouds_yaml_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/cluster_clouds_yaml_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ostgt-cloud-config
+  name: target-cluster-cloud-config
  namespace: default
 data:
  cacert: Cg==
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml
@ -1,13 +1,13 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
  namespace: default
 spec:
  infrastructureTemplate:
    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
    kind: OpenStackMachineTemplate
-    name: ostgt-control-plane
+    name: target-cluster-control-plane
  kubeadmConfigSpec:
    files:
    - path: /etc/kubernetes/cloud.conf
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_ip_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_ip_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
  namespace: default
 spec:
  kubeadmConfigSpec:
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_count_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_count_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
  namespace: default
 spec:
  replicas: 1
--- a/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_flavor_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_machine_flavor_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
  namespace: default
 spec:
  template:
--- a/manifests/site/openstack-test-site/target/controlplane/kustomization.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/kustomization.yaml
@ -9,21 +9,21 @@ patchesJson6902:
      group: infrastructure.cluster.x-k8s.io
      version: v1alpha3
      kind: OpenStackCluster
-      name: "ostgt"
+      name: "target-cluster"
    path: control_plane_ip.json

  - target:
      group: infrastructure.cluster.x-k8s.io
      version: v1alpha3
      kind: OpenStackCluster
-      name: "ostgt"
+      name: "target-cluster"
    path: dns_servers.json

  - target:
      group: infrastructure.cluster.x-k8s.io
      version: v1alpha3
      kind: OpenStackCluster
-      name: "ostgt"
+      name: "target-cluster"
    path: external_network_id.json

 patchesStrategicMerge:
--- a/manifests/site/openstack-test-site/target/controlplane/ssh_key_patch.yaml
+++ b/manifests/site/openstack-test-site/target/controlplane/ssh_key_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
 kind: KubeadmControlPlane
 metadata:
-  name: ostgt-control-plane
+  name: target-cluster-control-plane
  namespace: default
 spec:
  kubeadmConfigSpec:
--- a/manifests/site/openstack-test-site/target/workers/workers_cloud_conf_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_cloud_conf_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
  namespace: default
 spec:
  template:
--- a/manifests/site/openstack-test-site/target/workers/workers_machine_count_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_machine_count_patch.yaml
@ -1,8 +1,8 @@
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: MachineDeployment
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
  namespace: default
 spec:
-  clusterName: ostgt
+  clusterName: target-cluster
  replicas: 3
--- a/manifests/site/openstack-test-site/target/workers/workers_machine_flavor_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_machine_flavor_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: OpenStackMachineTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
  namespace: default
 spec:
  template:
--- a/manifests/site/openstack-test-site/target/workers/workers_ssh_key_patch.yaml
+++ b/manifests/site/openstack-test-site/target/workers/workers_ssh_key_patch.yaml
@ -1,7 +1,7 @@
 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
 kind: KubeadmConfigTemplate
 metadata:
-  name: ostgt-md-0
+  name: target-cluster-md-0
  namespace: default
 spec:
  template: