Skip to content

Commit 4e41837

Browse files
detiberdetiber
committed
Rename Packet to Equinix Metal
1 parent 79b2c5d commit 4e41837

35 files changed

Lines changed: 1200 additions & 149 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Ensure presence of expected number of replicas and a given provider config for a
3939

4040
- [cluster-api-provider-ovirt](https://github.com/openshift/cluster-api-provider-ovirt)
4141

42-
- [cluster-api-provider-packet](https://github.com/openshift/cluster-api-provider-packet)
42+
- [cluster-api-provider-equinix-metal](https://github.com/openshift/cluster-api-provider-equinix-metal)
4343

4444
Ensure that a provider instance is created for a Machine object in a given provider.
4545

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ require (
3939
replace sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201022175424-d30c7a274820
4040

4141
replace sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201016155852-4090a6970205
42+
43+
replace github.com/openshift/api => github.com/detiber/api v0.0.0-20201113192824-c19de3594400

‎go.sum‎

Lines changed: 93 additions & 12 deletions
Large diffs are not rendered by default.

‎install/0000_30_machine-api-operator_00_credentials-request.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ kind: CredentialsRequest
171171
metadata:
172172
labels:
173173
controller-tools.k8s.io: "1.0"
174-
name: openshift-machine-api-packet
174+
name: openshift-machine-api-equinix-metal
175175
namespace: openshift-cloud-credential-operator
176176
spec:
177177
secretRef:
178-
name: packet-credentials
178+
name: equinix-metal-credentials
179179
namespace: openshift-machine-api
180180
providerSpec:
181181
apiVersion: cloudcredential.openshift.io/v1
182-
kind: PacketProviderSpec
183-
---
182+
kind: EquinixMetalProviderSpec
183+
---

‎install/0000_30_machine-api-operator_01_images.configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data:
1919
"clusterAPIControllerGCP": "registry.svc.ci.openshift.org/openshift:gcp-machine-controllers",
2020
"clusterAPIControllerOvirt": "registry.svc.ci.openshift.org/openshift:ovirt-machine-controllers",
2121
"clusterAPIControllerKubevirt": "registry.svc.ci.openshift.org/openshift:kubevirt-machine-controllers",
22-
"clusterAPIControllerPacket": "registry.svc.ci.openshift.org/openshift:packet-machine-controllers",
22+
"clusterAPIControllerEquinixMetal": "registry.svc.ci.openshift.org/openshift:equinix-metal-machine-controllers",
2323
"clusterAPIControllerVSphere": "registry.svc.ci.openshift.org/openshift:machine-api-operator",
2424
"baremetalOperator": "registry.svc.ci.openshift.org/openshift:baremetal-operator",
2525
"baremetalIronic": "registry.svc.ci.openshift.org/openshift:ironic",

‎install/image-references‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
from:
6767
kind: DockerImage
6868
name: registry.svc.ci.openshift.org/openshift:kubevirt-machine-controllers
69-
- name: packet-machine-controllers
69+
- name: equinix-metal-machine-controllers
7070
from:
7171
kind: DockerImage
72-
name: registry.svc.ci.openshift.org/openshift:packet-machine-controllers
72+
name: registry.svc.ci.openshift.org/openshift:equinix-metal-machine-controllers

‎pkg/operator/config.go‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,18 @@ type BaremetalControllers struct {
4646

4747
// Images allows build systems to inject images for MAO components
4848
type Images struct {
49-
MachineAPIOperator string `json:"machineAPIOperator"`
50-
ClusterAPIControllerAWS string `json:"clusterAPIControllerAWS"`
51-
ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
52-
ClusterAPIControllerLibvirt string `json:"clusterAPIControllerLibvirt"`
53-
ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
54-
ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"`
55-
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
56-
ClusterAPIControllerOvirt string `json:"clusterAPIControllerOvirt"`
57-
ClusterAPIControllerVSphere string `json:"clusterAPIControllerVSphere"`
58-
ClusterAPIControllerKubevirt string `json:"clusterAPIControllerKubevirt"`
59-
KubeRBACProxy string `json:"kubeRBACProxy"`
49+
MachineAPIOperator string `json:"machineAPIOperator"`
50+
ClusterAPIControllerAWS string `json:"clusterAPIControllerAWS"`
51+
ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
52+
ClusterAPIControllerLibvirt string `json:"clusterAPIControllerLibvirt"`
53+
ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
54+
ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"`
55+
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
56+
ClusterAPIControllerOvirt string `json:"clusterAPIControllerOvirt"`
57+
ClusterAPIControllerVSphere string `json:"clusterAPIControllerVSphere"`
58+
ClusterAPIControllerKubevirt string `json:"clusterAPIControllerKubevirt"`
59+
ClusterAPIControllerEquinixMetal string `json:"clusterAPIControllerEquinixMetal"`
60+
KubeRBACProxy string `json:"kubeRBACProxy"`
6061
// Images required for the metal3 pod
6162
BaremetalOperator string `json:"baremetalOperator"`
6263
BaremetalIronic string `json:"baremetalIronic"`
@@ -108,6 +109,8 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
108109
return images.ClusterAPIControllerKubevirt, nil
109110
case kubemarkPlatform:
110111
return clusterAPIControllerKubemark, nil
112+
case configv1.EquinixMetalPlatformType:
113+
return images.ClusterAPIControllerEquinixMetal, nil
111114
default:
112115
return clusterAPIControllerNoOp, nil
113116
}

‎pkg/operator/config_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var (
2525
expectedOvirtImage = "quay.io/openshift/origin-ovirt-machine-controllers"
2626
expectedVSphereImage = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
2727
expectedKubevirtImage = "quay.io/openshift/origin-kubevirt-machine-controllers"
28-
expectedPacketImage = "quay.io/openshift/origin-packet-machine-controllers"
28+
expectedEquinixMetalImage = "quay.io/openshift/origin-equinix-metal-machine-controllers"
2929
)
3030

3131
func TestGetProviderFromInfrastructure(t *testing.T) {
@@ -105,10 +105,10 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
105105
}, {
106106
infra: &configv1.Infrastructure{
107107
Status: configv1.InfrastructureStatus{
108-
Platform: configv1.PacketPlatformType,
108+
Platform: configv1.EquinixMetalPlatformType,
109109
},
110110
},
111-
expected: configv1.PacketPlatformType,
111+
expected: configv1.EquinixMetalPlatformType,
112112
}}
113113

114114
for _, test := range tests {
@@ -154,8 +154,8 @@ func TestGetImagesFromJSONFile(t *testing.T) {
154154
if img.ClusterAPIControllerKubevirt != expectedKubevirtImage {
155155
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedKubevirtImage, img.ClusterAPIControllerKubevirt)
156156
}
157-
if img.ClusterAPIControllerPacket != expectedPacketImage {
158-
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedPacketImage, img.ClusterAPIControllerPacket)
157+
if img.ClusterAPIControllerEquinixMetal != expectedEquinixMetalImage {
158+
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedEquinixMetalImage, img.ClusterAPIControllerEquinixMetal)
159159
}
160160
}
161161

@@ -208,8 +208,8 @@ func TestGetProviderControllerFromImages(t *testing.T) {
208208
expectedImage: expectedKubevirtImage,
209209
},
210210
{
211-
provider: configv1.PacketPlatformType,
212-
expectedImage: expectedPacketImage,
211+
provider: configv1.EquinixMetalPlatformType,
212+
expectedImage: expectedEquinixMetalImage,
213213
},
214214
}
215215

@@ -274,7 +274,7 @@ func TestGetTerminationHandlerFromImages(t *testing.T) {
274274
expectedImage: clusterAPIControllerNoOp,
275275
},
276276
{
277-
provider: configv1.PacketPlatformType,
277+
provider: configv1.EquinixMetalPlatformType,
278278
expectedImage: clusterAPIControllerNoOp,
279279
},
280280
}

‎pkg/operator/fixtures/images.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"clusterAPIControllerAzure": "quay.io/openshift/origin-azure-machine-controllers:v4.0.0",
88
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers:v4.0.0",
99
"clusterAPIControllerOvirt": "quay.io/openshift/origin-ovirt-machine-controllers",
10-
"clusterAPIControllerPacket": "quay.io/openshift/origin-packet-machine-controllers",
10+
"clusterAPIControllerEquinixMetal": "quay.io/openshift/origin-equinix-metal-machine-controllers",
1111
"clusterAPIControllerVSphere": "docker.io/openshift/origin-machine-api-operator:v4.0.0",
1212
"clusterAPIControllerKubevirt": "quay.io/openshift/origin-kubevirt-machine-controllers",
1313
"baremetalOperator": "quay.io/openshift/origin-baremetal-operator:v4.2.0",

‎vendor/github.com/openshift/api/Dockerfile.build‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)