Skip to content

Commit 75933fe

Browse files
detiberdetiber
committed
Rename Packet to Equinix Metal
1 parent 260acda commit 75933fe

69 files changed

Lines changed: 2217 additions & 785 deletions

File tree

Some content is hidden

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

‎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: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ require (
2222
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
2323
golang.org/x/net v0.0.0-20200822124328-c89045814202
2424
gopkg.in/gcfg.v1 v1.2.3
25-
k8s.io/api v0.19.0
26-
k8s.io/apimachinery v0.19.0
25+
k8s.io/api v0.19.2
26+
k8s.io/apimachinery v0.19.2
2727
k8s.io/client-go v0.19.0
28-
k8s.io/code-generator v0.19.0
28+
k8s.io/code-generator v0.19.2
2929
k8s.io/klog/v2 v2.3.0
3030
k8s.io/kubectl v0.19.0
3131
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
@@ -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: 88 additions & 10 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ kind: CredentialsRequest
156156
metadata:
157157
labels:
158158
controller-tools.k8s.io: "1.0"
159-
name: openshift-machine-api-packet
159+
name: openshift-machine-api-equinix-metal
160160
namespace: openshift-cloud-credential-operator
161161
spec:
162162
secretRef:
163-
name: packet-credentials
163+
name: equinix-metal-credentials
164164
namespace: openshift-machine-api
165165
providerSpec:
166166
apiVersion: cloudcredential.openshift.io/v1
167-
kind: PacketProviderSpec
167+
kind: EquinixMetalProviderSpec
168168
---

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ data:
1717
"clusterAPIControllerAzure": "registry.svc.ci.openshift.org/openshift:azure-machine-controllers",
1818
"clusterAPIControllerGCP": "registry.svc.ci.openshift.org/openshift:gcp-machine-controllers",
1919
"clusterAPIControllerOvirt": "registry.svc.ci.openshift.org/openshift:ovirt-machine-controllers",
20-
"clusterAPIControllerPacket": "registry.svc.ci.openshift.org/openshift:packet-machine-controllers",
20+
"clusterAPIControllerEquinixMetal": "registry.svc.ci.openshift.org/openshift:equinix-metal-machine-controllers",
2121
"clusterAPIControllerVSphere": "registry.svc.ci.openshift.org/openshift:machine-api-operator",
2222
"baremetalOperator": "registry.svc.ci.openshift.org/openshift:baremetal-operator",
2323
"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
@@ -62,7 +62,7 @@ spec:
6262
from:
6363
kind: DockerImage
6464
name: registry.svc.ci.openshift.org/openshift:ovirt-machine-controllers
65-
- name: packet-machine-controllers
65+
- name: equinix-metal-machine-controllers
6666
from:
6767
kind: DockerImage
68-
name: registry.svc.ci.openshift.org/openshift:packet-machine-controllers
68+
name: registry.svc.ci.openshift.org/openshift:equinix-metal-machine-controllers

‎pkg/operator/config.go‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,17 @@ type BaremetalControllers struct {
4545

4646
// Images allows build systems to inject images for MAO components
4747
type Images struct {
48-
MachineAPIOperator string `json:"machineAPIOperator"`
49-
ClusterAPIControllerAWS string `json:"clusterAPIControllerAWS"`
50-
ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
51-
ClusterAPIControllerLibvirt string `json:"clusterAPIControllerLibvirt"`
52-
ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
53-
ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"`
54-
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
55-
ClusterAPIControllerOvirt string `json:"clusterAPIControllerOvirt"`
56-
ClusterAPIControllerVSphere string `json:"clusterAPIControllerVSphere"`
57-
KubeRBACProxy string `json:"kubeRBACProxy"`
48+
MachineAPIOperator string `json:"machineAPIOperator"`
49+
ClusterAPIControllerAWS string `json:"clusterAPIControllerAWS"`
50+
ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
51+
ClusterAPIControllerLibvirt string `json:"clusterAPIControllerLibvirt"`
52+
ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
53+
ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"`
54+
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
55+
ClusterAPIControllerOvirt string `json:"clusterAPIControllerOvirt"`
56+
ClusterAPIControllerVSphere string `json:"clusterAPIControllerVSphere"`
57+
ClusterAPIControllerEquinixMetal string `json:"clusterAPIControllerEquinixMetal"`
58+
KubeRBACProxy string `json:"kubeRBACProxy"`
5859
// Images required for the metal3 pod
5960
BaremetalOperator string `json:"baremetalOperator"`
6061
BaremetalIronic string `json:"baremetalIronic"`
@@ -104,6 +105,8 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
104105
return images.ClusterAPIControllerVSphere, nil
105106
case kubemarkPlatform:
106107
return clusterAPIControllerKubemark, nil
108+
case configv1.EquinixMetalPlatformType:
109+
return images.ClusterAPIControllerEquinixMetal, nil
107110
default:
108111
return clusterAPIControllerNoOp, nil
109112
}

‎pkg/operator/config_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var (
2424
expectedIronicStaticIpManager = "quay.io/openshift/origin-ironic-static-ip-manager:v4.2.0"
2525
expectedOvirtImage = "quay.io/openshift/origin-ovirt-machine-controllers"
2626
expectedVSphereImage = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
27-
expectedPacketImage = "quay.io/openshift/origin-packet-machine-controllers"
27+
expectedEquinixMetalImage = "quay.io/openshift/origin-equinix-metal-machine-controllers"
2828
)
2929

3030
func TestGetProviderFromInfrastructure(t *testing.T) {
@@ -104,10 +104,10 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
104104
}, {
105105
infra: &configv1.Infrastructure{
106106
Status: configv1.InfrastructureStatus{
107-
Platform: configv1.PacketPlatformType,
107+
Platform: configv1.EquinixMetalPlatformType,
108108
},
109109
},
110-
expected: configv1.PacketPlatformType,
110+
expected: configv1.EquinixMetalPlatformType,
111111
}}
112112

113113
for _, test := range tests {
@@ -150,8 +150,8 @@ func TestGetImagesFromJSONFile(t *testing.T) {
150150
if img.ClusterAPIControllerVSphere != expectedVSphereImage {
151151
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedVSphereImage, img.ClusterAPIControllerVSphere)
152152
}
153-
if img.ClusterAPIControllerPacket != expectedPacketImage {
154-
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedPacketImage, img.ClusterAPIControllerPacket)
153+
if img.ClusterAPIControllerEquinixMetal != expectedEquinixMetalImage {
154+
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedEquinixMetalImage, img.ClusterAPIControllerEquinixMetal)
155155
}
156156
}
157157

@@ -200,8 +200,8 @@ func TestGetProviderControllerFromImages(t *testing.T) {
200200
expectedImage: expectedOvirtImage,
201201
},
202202
{
203-
provider: configv1.PacketPlatformType,
204-
expectedImage: expectedPacketImage,
203+
provider: configv1.EquinixMetalPlatformType,
204+
expectedImage: expectedEquinixMetalImage,
205205
},
206206
}
207207

@@ -266,7 +266,7 @@ func TestGetTerminationHandlerFromImages(t *testing.T) {
266266
expectedImage: clusterAPIControllerNoOp,
267267
},
268268
{
269-
provider: configv1.PacketPlatformType,
269+
provider: configv1.EquinixMetalPlatformType,
270270
expectedImage: clusterAPIControllerNoOp,
271271
},
272272
}

‎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
"baremetalOperator": "quay.io/openshift/origin-baremetal-operator:v4.2.0",
1313
"baremetalIronic": "quay.io/openshift/origin-ironic: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)