Merge pull request #1042 from flaper87/master

openshift-merge-robot · web-flow · commit 5f357d21585d · 2019-01-14T03:56:38.000-08:00
openstack: update the machine templates
diff --git a/pkg/asset/machines/master.go b/pkg/asset/machines/master.go
@@ -116,6 +116,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 			instances = append(instances, fmt.Sprintf("master-%d", i))
 		}
 		config := openstack.MasterConfig{
+			CloudName:   ic.Platform.OpenStack.Cloud,
 			ClusterName: ic.ObjectMeta.Name,
 			Instances:   instances,
 			Image:       string(*rhcosImage),
diff --git a/pkg/asset/machines/openstack/master.go b/pkg/asset/machines/openstack/master.go
@@ -9,6 +9,7 @@ import (
 
 // MasterConfig is used to generate the machine.
 type MasterConfig struct {
+	CloudName   string
 	ClusterName string
 	Instances   []string
 	Image       string
@@ -42,31 +43,24 @@ items:
       value:
         apiVersion: openstack.cluster.k8s.io/v1alpha1
         kind: OpenStackMachineProviderConfig
-        image:
-          id: {{$c.Image}}
+        cloudName: {{$c.CloudName}}
+        cloudsSecret: "openstack-credentials"
+        image: {{$c.Image}}
         flavor: {{$c.Machine.FlavorName}}
         placement:
           region: {{$c.Region}}
-        subnet:
-          filters:
-          - name: "tag:Name"
-            values:
-            - "{{$c.ClusterName}}-master-*"
-        tags:
+        networks:
 {{- range $key,$value := $c.Tags}}
-          - name: "{{$key}}"
-            value: "{{$value}}"
+        - filter:
+            tags: "{{$key}}={{$value}}"
 {{- end}}
         securityGroups:
-          - filters:
-            - name: "tag:Name"
-              values:
-              - "{{$c.ClusterName}}_master_sg"
+          - master
         userDataSecret:
           name: master-user-data
         trunk: {{$c.Trunk}}
     versions:
-      kubelet: ""
+      kubelet: "v1.11.0"
       controlPlane: ""
 {{- end -}}
 `))
diff --git a/pkg/asset/machines/openstack/worker.go b/pkg/asset/machines/openstack/worker.go
@@ -9,6 +9,7 @@ import (
 
 // Config is used to generate the machine.
 type Config struct {
+	CloudName   string
 	ClusterName string
 	Replicas    int64
 	Image       string
@@ -23,7 +24,7 @@ var WorkerMachineSetTmpl = template.Must(template.New("openstack-worker-machines
 apiVersion: cluster.k8s.io/v1alpha1
 kind: MachineSet
 metadata:
-  name: {{.ClusterName}}-worker-0
+  name: {{.ClusterName}}-worker
   namespace: openshift-cluster-api
   labels:
     sigs.k8s.io/cluster-api-cluster: {{.ClusterName}}
@@ -33,12 +34,12 @@ spec:
   replicas: {{.Replicas}}
   selector:
     matchLabels:
-      sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker-0
+      sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker
       sigs.k8s.io/cluster-api-cluster: {{.ClusterName}}
   template:
     metadata:
       labels:
-        sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker-0
+        sigs.k8s.io/cluster-api-machineset: {{.ClusterName}}-worker
         sigs.k8s.io/cluster-api-cluster: {{.ClusterName}}
         sigs.k8s.io/cluster-api-machine-role: worker
         sigs.k8s.io/cluster-api-machine-type: worker
@@ -47,30 +48,23 @@ spec:
         value:
           apiVersion: openstack.cluster.k8s.io/v1alpha1
           kind: OpenStackMachineProviderConfig
-          image:
-            id: {{.Image}}
+          cloudName: {{.CloudName}}
+          cloudsSecret: "openstack-credentials"
+          image: {{.Image}}
           flavor: {{.Machine.FlavorName}}
           placement:
             region: {{.Region}}
-          subnet:
-            filters:
-            - name: "tag:Name"
-              values:
-              - "{{.ClusterName}}-worker-*"
-          tags:
+          networks:
 {{- range $key,$value := .Tags}}
-            - name: "{{$key}}"
-              value: "{{$value}}"
+          - filter:
+              tags: "{{$key}}={{$value}}"
 {{- end}}
           securityGroups:
-            - filters:
-              - name: "tag:Name"
-                values:
-                - "{{.ClusterName}}_worker_sg"
+            - worker
           userDataSecret:
             name: worker-user-data
           trunk: {{.Trunk}}
       versions:
-        kubelet: ""
+        kubelet: "v1.11.0"
         controlPlane: ""
 `))
diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go
@@ -138,6 +138,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 			numOfWorkers = *pool.Replicas
 		}
 		config := openstack.Config{
+			CloudName:   ic.Platform.OpenStack.Cloud,
 			ClusterName: ic.ObjectMeta.Name,
 			Replicas:    numOfWorkers,
 			Image:       string(*rhcosImage),

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {`
`116`	`116`	`instances = append(instances, fmt.Sprintf("master-%d", i))`
`117`	`117`	`}`
`118`	`118`	`config := openstack.MasterConfig{`
	`119`	`+ CloudName: ic.Platform.OpenStack.Cloud,`
`119`	`120`	`ClusterName: ic.ObjectMeta.Name,`
`120`	`121`	`Instances: instances,`
`121`	`122`	`Image: string(*rhcosImage),`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {`
`138`	`138`	`numOfWorkers = *pool.Replicas`
`139`	`139`	`}`
`140`	`140`	`config := openstack.Config{`
	`141`	`+ CloudName: ic.Platform.OpenStack.Cloud,`
`141`	`142`	`ClusterName: ic.ObjectMeta.Name,`
`142`	`143`	`Replicas: numOfWorkers,`
`143`	`144`	`Image: string(*rhcosImage),`