diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index f3e22a4341..e41c706b6f 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -1,4 +1,4 @@ -Lifecycle: null +Lifecycle: "" Name: etcd-clients-ca Signer: null alternateNames: null @@ -6,7 +6,7 @@ oldFormat: false subject: cn=etcd-clients-ca type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-events Signer: null alternateNames: null @@ -14,7 +14,7 @@ oldFormat: false subject: cn=etcd-manager-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-main Signer: null alternateNames: null @@ -22,7 +22,7 @@ oldFormat: false subject: cn=etcd-manager-ca-main type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-events Signer: null alternateNames: null @@ -30,7 +30,7 @@ oldFormat: false subject: cn=etcd-peers-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-main Signer: null alternateNames: null @@ -43,7 +43,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-events Public: null @@ -53,7 +53,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-main Public: null @@ -124,7 +124,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/events.yaml Name: manifests-etcdmanager-events Public: null @@ -195,7 +195,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/main.yaml Name: manifests-etcdmanager-main Public: null diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index c8bbbfafba..77ac9315ab 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -1,4 +1,4 @@ -Lifecycle: null +Lifecycle: "" Name: etcd-clients-ca Signer: null alternateNames: null @@ -6,7 +6,7 @@ oldFormat: false subject: cn=etcd-clients-ca type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-events Signer: null alternateNames: null @@ -14,7 +14,7 @@ oldFormat: false subject: cn=etcd-manager-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-main Signer: null alternateNames: null @@ -22,7 +22,7 @@ oldFormat: false subject: cn=etcd-manager-ca-main type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-events Signer: null alternateNames: null @@ -30,7 +30,7 @@ oldFormat: false subject: cn=etcd-peers-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-main Signer: null alternateNames: null @@ -43,7 +43,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-events Public: null @@ -53,7 +53,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-main Public: null @@ -127,7 +127,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/events.yaml Name: manifests-etcdmanager-events Public: null @@ -201,7 +201,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/main.yaml Name: manifests-etcdmanager-main Public: null diff --git a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml index f6e9e7bcf8..106ec956dc 100644 --- a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml @@ -1,4 +1,4 @@ -Lifecycle: null +Lifecycle: "" Name: etcd-clients-ca Signer: null alternateNames: null @@ -6,7 +6,7 @@ oldFormat: false subject: cn=etcd-clients-ca type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-events Signer: null alternateNames: null @@ -14,7 +14,7 @@ oldFormat: false subject: cn=etcd-manager-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-main Signer: null alternateNames: null @@ -22,7 +22,7 @@ oldFormat: false subject: cn=etcd-manager-ca-main type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-events Signer: null alternateNames: null @@ -30,7 +30,7 @@ oldFormat: false subject: cn=etcd-peers-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-main Signer: null alternateNames: null @@ -43,7 +43,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-events Public: null @@ -53,7 +53,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-main Public: null @@ -124,7 +124,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/events.yaml Name: manifests-etcdmanager-events Public: null @@ -195,7 +195,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/main.yaml Name: manifests-etcdmanager-main Public: null diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index d0c3e67a5d..6d3aa06bd4 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -1,4 +1,4 @@ -Lifecycle: null +Lifecycle: "" Name: etcd-clients-ca Signer: null alternateNames: null @@ -6,7 +6,7 @@ oldFormat: false subject: cn=etcd-clients-ca type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-events Signer: null alternateNames: null @@ -14,7 +14,7 @@ oldFormat: false subject: cn=etcd-manager-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-manager-ca-main Signer: null alternateNames: null @@ -22,7 +22,7 @@ oldFormat: false subject: cn=etcd-manager-ca-main type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-events Signer: null alternateNames: null @@ -30,7 +30,7 @@ oldFormat: false subject: cn=etcd-peers-ca-events type: ca --- -Lifecycle: null +Lifecycle: "" Name: etcd-peers-ca-main Signer: null alternateNames: null @@ -43,7 +43,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-events Public: null @@ -53,7 +53,7 @@ Contents: |- { "memberCount": 1 } -Lifecycle: null +Lifecycle: "" Location: /control/etcd-cluster-spec Name: etcd-cluster-spec-main Public: null @@ -133,7 +133,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/events.yaml Name: manifests-etcdmanager-events Public: null @@ -213,7 +213,7 @@ Contents: | type: FileOrCreate name: varlogetcd status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/etcd/main.yaml Name: manifests-etcdmanager-main Public: null diff --git a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml index 68339c2eb9..639f553433 100644 --- a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml +++ b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml @@ -32,7 +32,7 @@ Contents: | type: Directory name: healthcheck-secrets status: {} -Lifecycle: null +Lifecycle: "" Location: manifests/static/kube-apiserver-healthcheck.yaml Name: manifests-static-kube-apiserver-healthcheck Public: null diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml index 0a8a9b44bc..464d3caf3d 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -31,13 +31,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -45,7 +45,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -68,7 +68,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -84,13 +84,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -98,7 +98,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml index f581f9b7e3..cc8374b575 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml @@ -31,13 +31,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -45,7 +45,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -67,7 +67,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -82,13 +82,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -96,7 +96,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml index f581f9b7e3..cc8374b575 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml @@ -31,13 +31,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -45,7 +45,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -67,7 +67,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -82,13 +82,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -96,7 +96,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml index 3ac180d7eb..54d74cd59a 100644 --- a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml @@ -30,13 +30,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -44,7 +44,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -66,7 +66,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -81,13 +81,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -95,7 +95,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml index e89bd3056b..50220020c9 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml @@ -83,19 +83,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -103,7 +103,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -164,19 +164,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -184,7 +184,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -245,19 +245,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -265,7 +265,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -323,13 +323,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -337,7 +337,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -395,13 +395,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -409,7 +409,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -467,13 +467,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -481,7 +481,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -503,7 +503,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -518,19 +518,19 @@ Name: port-master-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -538,7 +538,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -551,19 +551,19 @@ Name: port-master-2-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -571,7 +571,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -584,19 +584,19 @@ Name: port-master-3-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -604,7 +604,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -617,13 +617,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -631,7 +631,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -644,13 +644,13 @@ Name: port-node-2-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -658,7 +658,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -671,13 +671,13 @@ Name: port-node-3-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -685,7 +685,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml index 8c9d3eae2a..bd38aed156 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml @@ -21,7 +21,7 @@ LB: SecurityGroup: Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -84,13 +84,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false @@ -98,7 +98,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -153,13 +153,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false @@ -167,7 +167,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -222,13 +222,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false @@ -236,7 +236,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -294,13 +294,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -308,7 +308,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -366,13 +366,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -380,7 +380,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -438,13 +438,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -452,7 +452,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -474,7 +474,7 @@ UserData: task: Name: node-c --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -489,7 +489,7 @@ PortID: null SecurityGroup: Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -511,7 +511,7 @@ Pool: SecurityGroup: Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -529,7 +529,7 @@ Loadbalancer: SecurityGroup: Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -552,7 +552,7 @@ Pool: SecurityGroup: Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -585,7 +585,7 @@ Pool: SecurityGroup: Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -618,7 +618,7 @@ Pool: SecurityGroup: Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -643,13 +643,13 @@ Name: port-master-a-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false @@ -657,7 +657,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -670,13 +670,13 @@ Name: port-master-b-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false @@ -684,7 +684,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -697,13 +697,13 @@ Name: port-master-c-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false @@ -711,7 +711,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -724,13 +724,13 @@ Name: port-node-a-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -738,7 +738,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -751,13 +751,13 @@ Name: port-node-b-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -765,7 +765,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -778,13 +778,13 @@ Name: port-node-c-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -792,7 +792,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml index 6a45b4127c..ac5b92b98d 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml @@ -91,19 +91,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -111,7 +111,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -172,19 +172,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -192,7 +192,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -253,19 +253,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -273,7 +273,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -331,13 +331,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -345,7 +345,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -403,13 +403,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -417,7 +417,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -475,13 +475,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -489,7 +489,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -511,7 +511,7 @@ UserData: task: Name: node-c --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -526,19 +526,19 @@ Name: port-master-a-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -546,7 +546,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -559,19 +559,19 @@ Name: port-master-b-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -579,7 +579,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -592,19 +592,19 @@ Name: port-master-c-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -612,7 +612,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -625,13 +625,13 @@ Name: port-node-a-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -639,7 +639,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -652,13 +652,13 @@ Name: port-node-b-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -666,7 +666,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -679,13 +679,13 @@ Name: port-node-c-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -693,7 +693,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml index f0ff53abe1..578fd38953 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml @@ -43,19 +43,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -63,7 +63,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -118,19 +118,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -138,7 +138,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -193,19 +193,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -213,7 +213,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -265,13 +265,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -279,7 +279,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -331,13 +331,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -345,7 +345,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -397,13 +397,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -411,7 +411,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -433,7 +433,7 @@ UserData: task: Name: node-c --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -448,19 +448,19 @@ Name: port-master-a-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -468,7 +468,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -481,19 +481,19 @@ Name: port-master-b-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -501,7 +501,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -514,19 +514,19 @@ Name: port-master-c-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -534,7 +534,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null @@ -547,13 +547,13 @@ Name: port-node-a-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -561,7 +561,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-a.cluster Network: null Tag: null @@ -574,13 +574,13 @@ Name: port-node-b-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -588,7 +588,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-b.cluster Network: null Tag: null @@ -601,13 +601,13 @@ Name: port-node-c-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -615,7 +615,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet-c.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml index efaadd8c82..77000ab910 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml @@ -33,13 +33,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: bastion.cluster RemoveExtraRules: null RemoveGroup: false @@ -47,7 +47,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: utility-subnet.cluster Network: null Tag: null @@ -102,19 +102,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -122,7 +122,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -174,13 +174,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -188,7 +188,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -210,7 +210,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -225,13 +225,13 @@ Name: port-bastion-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: bastion.cluster RemoveExtraRules: null RemoveGroup: false @@ -239,7 +239,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: utility-subnet.cluster Network: null Tag: null @@ -252,19 +252,19 @@ Name: port-master-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -272,7 +272,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -285,13 +285,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -299,7 +299,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml index 3bef65ad21..93f5982091 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml @@ -53,13 +53,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: bastion.cluster RemoveExtraRules: null RemoveGroup: false @@ -67,7 +67,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: utility-subnet.cluster Network: null Tag: null @@ -128,19 +128,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -148,7 +148,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -200,13 +200,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -214,7 +214,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -236,7 +236,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -251,13 +251,13 @@ Name: port-bastion-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: bastion.cluster RemoveExtraRules: null RemoveGroup: false @@ -265,7 +265,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: utility-subnet.cluster Network: null Tag: null @@ -278,19 +278,19 @@ Name: port-master-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -298,7 +298,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -311,13 +311,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -325,7 +325,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml index 0ebbd1317d..201581f1a0 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml @@ -35,19 +35,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -55,7 +55,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -107,13 +107,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -121,7 +121,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -143,7 +143,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -158,19 +158,19 @@ Name: port-master-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -178,7 +178,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -191,13 +191,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -205,7 +205,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml index 55f81fa9a8..db8471da11 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -55,19 +55,19 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -75,7 +75,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -133,13 +133,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -147,7 +147,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -169,7 +169,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -184,19 +184,19 @@ Name: port-master-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: masters.cluster RemoveExtraRules: null RemoveGroup: false - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: master-public-name RemoveExtraRules: null RemoveGroup: false @@ -204,7 +204,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -217,13 +217,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -231,7 +231,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml index 0f9ee34b92..f5d9d65c98 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml @@ -31,13 +31,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -45,7 +45,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -68,7 +68,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -84,13 +84,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -98,7 +98,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml index 1247fd6e21..60bf8e75c7 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml @@ -31,13 +31,13 @@ Port: Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -45,7 +45,7 @@ Port: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null @@ -68,7 +68,7 @@ UserData: task: Name: node --- -Lifecycle: null +Lifecycle: "" Name: ca Signer: null alternateNames: null @@ -84,13 +84,13 @@ Name: port-node-1-cluster Network: AvailabilityZoneHints: null ID: null - Lifecycle: null + Lifecycle: "" Name: cluster Tag: null SecurityGroups: - Description: null ID: null - Lifecycle: null + Lifecycle: "" Name: nodes.cluster RemoveExtraRules: null RemoveGroup: false @@ -98,7 +98,7 @@ Subnets: - CIDR: null DNSServers: null ID: null - Lifecycle: null + Lifecycle: "" Name: subnet.cluster Network: null Tag: null