Skip to content

Commit 70066ae

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #12 from shiftstack/v1beta1
V1beta1
2 parents 0890432 + a2da6cc commit 70066ae

File tree

191 files changed

+15246
-1450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+15246
-1450
lines changed

‎cmd/manager/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"os"
2323
"time"
2424

25-
"shiftstack/machine-api-provider-openstack/pkg/apis"
26-
"shiftstack/machine-api-provider-openstack/pkg/machine"
27-
"shiftstack/machine-api-provider-openstack/pkg/machineset"
25+
"github.com/openshift/machine-api-provider-openstack/pkg/apis"
26+
"github.com/openshift/machine-api-provider-openstack/pkg/machine"
27+
"github.com/openshift/machine-api-provider-openstack/pkg/machineset"
2828

2929
configv1 "github.com/openshift/api/config/v1"
3030
machinev1 "github.com/openshift/api/machine/v1beta1"

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module shiftstack/machine-api-provider-openstack
1+
module github.com/openshift/machine-api-provider-openstack
22

33
go 1.15
44

@@ -12,23 +12,23 @@ require (
1212
github.com/gophercloud/gophercloud v0.16.0
1313
github.com/gophercloud/utils v0.0.0-20210323225332-7b186010c04f
1414
github.com/onsi/ginkgo v1.16.4
15-
github.com/onsi/gomega v1.15.0
15+
github.com/onsi/gomega v1.16.0
1616
github.com/openshift/api v0.0.0-20211108165917-be1be0e89115
1717
github.com/openshift/client-go v0.0.0-20211025111749-96ca2abfc56c
1818
github.com/openshift/machine-api-operator v0.2.1-0.20211111133920-c8bba3e64310
1919
github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb // indirect
2020
go4.org v0.0.0-20191010144846-132d2879e1e9 // indirect
2121
gopkg.in/yaml.v2 v2.4.0
22-
k8s.io/api v0.22.1
23-
k8s.io/apimachinery v0.22.1
24-
k8s.io/client-go v0.22.1
25-
k8s.io/cluster-bootstrap v0.21.1
22+
k8s.io/api v0.22.2
23+
k8s.io/apimachinery v0.22.2
24+
k8s.io/client-go v0.22.2
25+
k8s.io/cluster-bootstrap v0.22.2
2626
k8s.io/klog v1.0.0
2727
k8s.io/klog/v2 v2.9.0
28-
sigs.k8s.io/cluster-api v0.4.3
29-
sigs.k8s.io/cluster-api-provider-openstack v0.4.1-0.20211011120440-eb83033a0bca
30-
sigs.k8s.io/controller-runtime v0.9.7
31-
sigs.k8s.io/yaml v1.2.0
28+
sigs.k8s.io/cluster-api v1.0.2
29+
sigs.k8s.io/cluster-api-provider-openstack v0.5.1-0.20211208064945-172c23f148b0
30+
sigs.k8s.io/controller-runtime v0.10.3
31+
sigs.k8s.io/yaml v1.3.0
3232
)
3333

34-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0-beta.1
34+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.2

‎go.sum‎

Lines changed: 126 additions & 61 deletions
Large diffs are not rendered by default.

‎pkg/apis/apis.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ limitations under the License.
2121
package apis
2222

2323
import (
24+
"github.com/openshift/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
2425
"k8s.io/apimachinery/pkg/runtime"
25-
"shiftstack/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
2626
)
2727

2828
// AddToSchemes may be used to add all resources defined in the project to a Scheme

‎pkg/apis/openstackproviderconfig/v1alpha1/convert.go‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package v1alpha1
22

33
import (
44
machinev1 "github.com/openshift/api/machine/v1beta1"
5-
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
5+
capov1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
66
)
77

8-
func (cps OpenstackClusterProviderSpec) toClusterSpec() infrav1.OpenStackClusterSpec {
9-
return infrav1.OpenStackClusterSpec{
8+
func (cps OpenstackClusterProviderSpec) toClusterSpec() capov1.OpenStackClusterSpec {
9+
return capov1.OpenStackClusterSpec{
1010
NodeCIDR: cps.NodeCIDR,
1111
DNSNameservers: cps.DNSNameservers,
1212
ExternalNetworkID: cps.ExternalNetworkID,
@@ -15,25 +15,25 @@ func (cps OpenstackClusterProviderSpec) toClusterSpec() infrav1.OpenStackCluster
1515
}
1616
}
1717

18-
func (cps OpenstackClusterProviderStatus) toClusterStatus() infrav1.OpenStackClusterStatus {
19-
clusterStatus := infrav1.OpenStackClusterStatus{Ready: true}
18+
func (cps OpenstackClusterProviderStatus) toClusterStatus() capov1.OpenStackClusterStatus {
19+
clusterStatus := capov1.OpenStackClusterStatus{Ready: true}
2020

2121
if cps.Network != nil {
22-
clusterStatus.Network = &infrav1.Network{
22+
clusterStatus.Network = &capov1.Network{
2323
Name: cps.Network.Name,
2424
ID: cps.Network.ID,
2525
}
2626
if cps.Network.Subnet != nil {
2727
subnet := cps.Network.Subnet
28-
clusterStatus.Network.Subnet = &infrav1.Subnet{
28+
clusterStatus.Network.Subnet = &capov1.Subnet{
2929
Name: subnet.Name,
3030
ID: subnet.ID,
3131
CIDR: subnet.CIDR,
3232
}
3333
}
3434
if cps.Network.Router != nil {
3535
router := cps.Network.Router
36-
clusterStatus.Network.Router = &infrav1.Router{
36+
clusterStatus.Network.Router = &capov1.Router{
3737
Name: router.Name,
3838
ID: router.ID,
3939
}
@@ -42,39 +42,39 @@ func (cps OpenstackClusterProviderStatus) toClusterStatus() infrav1.OpenStackClu
4242
return clusterStatus
4343
}
4444

45-
func NewOpenStackCluster(providerSpec OpenstackClusterProviderSpec, providerStatus OpenstackClusterProviderStatus) infrav1.OpenStackCluster {
46-
return infrav1.OpenStackCluster{
45+
func NewOpenStackCluster(providerSpec OpenstackClusterProviderSpec, providerStatus OpenstackClusterProviderStatus) capov1.OpenStackCluster {
46+
return capov1.OpenStackCluster{
4747
ObjectMeta: providerSpec.ObjectMeta,
4848

4949
Spec: providerSpec.toClusterSpec(),
5050
Status: providerStatus.toClusterStatus(),
5151
}
5252
}
5353

54-
func (ps OpenstackProviderSpec) toMachineSpec() infrav1.OpenStackMachineSpec {
55-
machineSpec := infrav1.OpenStackMachineSpec{
54+
func (ps OpenstackProviderSpec) toMachineSpec() capov1.OpenStackMachineSpec {
55+
machineSpec := capov1.OpenStackMachineSpec{
5656
CloudName: ps.CloudName,
5757
Flavor: ps.Flavor,
5858
Image: ps.Image,
5959
SSHKeyName: ps.KeyName,
60-
Networks: make([]infrav1.NetworkParam, len(ps.Networks)),
61-
Ports: make([]infrav1.PortOpts, len(ps.Ports)),
60+
Networks: make([]capov1.NetworkParam, len(ps.Networks)),
61+
Ports: make([]capov1.PortOpts, len(ps.Ports)),
6262
FloatingIP: ps.FloatingIP,
63-
SecurityGroups: make([]infrav1.SecurityGroupParam, len(ps.SecurityGroups)),
63+
SecurityGroups: make([]capov1.SecurityGroupParam, len(ps.SecurityGroups)),
6464
Trunk: ps.Trunk,
6565
Tags: ps.Tags,
6666
ServerMetadata: ps.ServerMetadata,
6767
ConfigDrive: ps.ConfigDrive,
6868
ServerGroupID: ps.ServerGroupID,
69-
IdentityRef: &infrav1.OpenStackIdentityReference{
69+
IdentityRef: &capov1.OpenStackIdentityReference{
7070
Kind: "secret",
7171
Name: ps.CloudsSecret.Name,
7272
},
7373
}
7474

7575
// TODO: close upstream/downstream feature gap: zones
7676
if ps.RootVolume != nil {
77-
machineSpec.RootVolume = &infrav1.RootVolume{
77+
machineSpec.RootVolume = &capov1.RootVolume{
7878
SourceType: ps.RootVolume.SourceType,
7979
SourceUUID: ps.RootVolume.SourceUUID,
8080
DeviceType: ps.RootVolume.DeviceType,
@@ -83,65 +83,65 @@ func (ps OpenstackProviderSpec) toMachineSpec() infrav1.OpenStackMachineSpec {
8383
}
8484

8585
for i, secGrp := range ps.SecurityGroups {
86-
machineSpec.SecurityGroups[i] = infrav1.SecurityGroupParam{
86+
machineSpec.SecurityGroups[i] = capov1.SecurityGroupParam{
8787
UUID: secGrp.UUID,
8888
Name: secGrp.Name,
89-
Filter: infrav1.SecurityGroupFilter(secGrp.Filter),
89+
Filter: capov1.SecurityGroupFilter(secGrp.Filter),
9090
}
9191
}
9292

9393
// TODO: close upstream/downstream feature gap: port security
9494
for i, port := range ps.Ports {
95-
machineSpec.Ports[i] = infrav1.PortOpts{
95+
machineSpec.Ports[i] = capov1.PortOpts{
9696
NetworkID: port.NetworkID,
9797
NameSuffix: port.NameSuffix,
9898
Description: port.Description,
9999
AdminStateUp: port.AdminStateUp,
100100
MACAddress: port.MACAddress,
101101
TenantID: port.TenantID,
102-
FixedIPs: make([]infrav1.FixedIP, len(port.FixedIPs)),
102+
FixedIPs: make([]capov1.FixedIP, len(port.FixedIPs)),
103103
ProjectID: port.ProjectID,
104104
SecurityGroups: port.SecurityGroups,
105-
AllowedAddressPairs: make([]infrav1.AddressPair, len(port.AllowedAddressPairs)),
105+
AllowedAddressPairs: make([]capov1.AddressPair, len(port.AllowedAddressPairs)),
106106
HostID: port.HostID,
107107
VNICType: port.VNICType,
108108
}
109109

110110
for fixedIPindex, fixedIP := range port.FixedIPs {
111-
machineSpec.Ports[i].FixedIPs[fixedIPindex] = infrav1.FixedIP(fixedIP)
111+
machineSpec.Ports[i].FixedIPs[fixedIPindex] = capov1.FixedIP(fixedIP)
112112
}
113113

114114
for addrPairIndex, addrPair := range port.AllowedAddressPairs {
115-
machineSpec.Ports[i].AllowedAddressPairs[addrPairIndex] = infrav1.AddressPair(addrPair)
115+
machineSpec.Ports[i].AllowedAddressPairs[addrPairIndex] = capov1.AddressPair(addrPair)
116116
}
117117
}
118118

119119
// TODO: close upstream/downstream feature gap or depricate feature in favor of ports interface: port tags, port security
120120
for i, network := range ps.Networks {
121-
machineSpec.Networks[i] = infrav1.NetworkParam{
121+
machineSpec.Networks[i] = capov1.NetworkParam{
122122
UUID: network.UUID,
123123
FixedIP: network.FixedIp,
124-
Filter: infrav1.Filter(network.Filter),
125-
Subnets: make([]infrav1.SubnetParam, len(network.Subnets)),
124+
Filter: capov1.Filter(network.Filter),
125+
Subnets: make([]capov1.SubnetParam, len(network.Subnets)),
126126
}
127127
for subnetIndex, subnet := range network.Subnets {
128-
machineSpec.Networks[i].Subnets[subnetIndex] = infrav1.SubnetParam{
128+
machineSpec.Networks[i].Subnets[subnetIndex] = capov1.SubnetParam{
129129
UUID: subnet.UUID,
130-
Filter: infrav1.SubnetFilter(subnet.Filter),
130+
Filter: capov1.SubnetFilter(subnet.Filter),
131131
}
132132
}
133133
}
134134

135135
return machineSpec
136136
}
137137

138-
func NewOpenStackMachine(machine *machinev1.Machine) (*infrav1.OpenStackMachine, error) {
138+
func NewOpenStackMachine(machine *machinev1.Machine) (*capov1.OpenStackMachine, error) {
139139
providerSpec, err := MachineSpecFromProviderSpec(machine.Spec.ProviderSpec)
140140
if err != nil {
141141
return nil, err
142142
}
143143

144-
osMachine := &infrav1.OpenStackMachine{
144+
osMachine := &capov1.OpenStackMachine{
145145
ObjectMeta: machine.ObjectMeta,
146146
Spec: providerSpec.toMachineSpec(),
147147
}

‎pkg/clients/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
machinev1 "github.com/openshift/api/machine/v1beta1"
1414
"gopkg.in/yaml.v2"
1515

16-
openstackconfigv1 "shiftstack/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
16+
openstackconfigv1 "github.com/openshift/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
1717

1818
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1919
"k8s.io/client-go/kubernetes"

‎pkg/machine/actuator.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/tools/record"
2626

27-
"sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
27+
capov1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
2828
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute"
29-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
29+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3030

31-
openstackconfigv1 "shiftstack/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
32-
"shiftstack/machine-api-provider-openstack/pkg/clients"
31+
openstackconfigv1 "github.com/openshift/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
32+
"github.com/openshift/machine-api-provider-openstack/pkg/clients"
3333

3434
machinev1 "github.com/openshift/api/machine/v1beta1"
3535
configclient "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
@@ -88,7 +88,7 @@ func (oc *OpenstackClient) getOpenStackContext(machine *machinev1.Machine) (*ope
8888
return &openStackContext{provider, &cloud}, nil
8989
}
9090

91-
func getOSCluster() v1alpha4.OpenStackCluster {
91+
func getOSCluster() capov1.OpenStackCluster {
9292
// TODO(egarcia): if we ever use the cluster object, this will benifit from reading from it
9393
var clusterSpec openstackconfigv1.OpenstackClusterProviderSpec
9494

@@ -144,7 +144,7 @@ func (oc *OpenstackClient) Create(ctx context.Context, machine *machinev1.Machin
144144
return oc.handleMachineError(machine, maoMachine.CreateMachine("error creating bootstrap for %s: %v", machine.Name, err), createEventAction)
145145
}
146146

147-
// Convert to v1alpha4
147+
// Convert to capov1
148148
osMachine, err := openstackconfigv1.NewOpenStackMachine(machine)
149149
if err != nil {
150150
return err
@@ -266,7 +266,7 @@ func (oc *OpenstackClient) Update(ctx context.Context, machine *machinev1.Machin
266266
return nil
267267
}
268268

269-
func (oc *OpenstackClient) updateMachine(ctx context.Context, machine *machinev1.Machine, osc *openStackContext, providerSpec *openstackconfigv1.OpenstackProviderSpec, instanceStatus *compute.InstanceStatus, osCluster *v1alpha4.OpenStackCluster) error {
269+
func (oc *OpenstackClient) updateMachine(ctx context.Context, machine *machinev1.Machine, osc *openStackContext, providerSpec *openstackconfigv1.OpenstackProviderSpec, instanceStatus *compute.InstanceStatus, osCluster *capov1.OpenStackCluster) error {
270270
if providerSpec.FloatingIP != "" {
271271
networkStatus, err := instanceStatus.NetworkStatus()
272272
if err != nil {

‎pkg/machine/machineScript.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"fmt"
2424
"text/template"
2525

26-
openstackconfigv1 "shiftstack/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
27-
"shiftstack/machine-api-provider-openstack/pkg/bootstrap"
26+
openstackconfigv1 "github.com/openshift/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
27+
"github.com/openshift/machine-api-provider-openstack/pkg/bootstrap"
2828

2929
clconfig "github.com/coreos/container-linux-config-transpiler/config"
3030
machinev1 "github.com/openshift/api/machine/v1beta1"

‎pkg/machine/utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ func clientOptsForCloud(cloud *clientconfig.Cloud) *clientconfig.ClientOpts {
4040
}
4141

4242
func (osc *openStackContext) getComputeService() (*compute.Service, error) {
43-
return compute.NewService(osc.provider, clientOptsForCloud(osc.cloud), ctrl.Log)
43+
return compute.NewService(osc.provider, clientOptsForCloud(osc.cloud), ctrl.Log.WithName("capo-compute"))
4444
}
4545

4646
func (osc *openStackContext) getNetworkService() (*networking.Service, error) {
47-
return networking.NewService(osc.provider, clientOptsForCloud(osc.cloud), ctrl.Log)
47+
return networking.NewService(osc.provider, clientOptsForCloud(osc.cloud), ctrl.Log.WithName("capo-network"))
4848
}
4949

5050
func getClusterNameWithNamespace(machine *machinev1.Machine) string {

‎pkg/machineset/controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strconv"
77
"time"
88

9-
openstackconfigv1 "shiftstack/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
10-
"shiftstack/machine-api-provider-openstack/pkg/clients"
9+
openstackconfigv1 "github.com/openshift/machine-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
10+
"github.com/openshift/machine-api-provider-openstack/pkg/clients"
1111

1212
"github.com/go-logr/logr"
1313
"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"

0 commit comments

Comments
 (0)