Skip to content

Commit 3f0c2d1

Browse files
hunterkepleyopenshift-cherrypick-robot
authored and
openshift-cherrypick-robot
committed
OCM-13516 | fix: Rename key values used for migration API request
1 parent 79448f2 commit 3f0c2d1

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

pkg/ocm/clusters.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -630,14 +630,14 @@ func (c *Client) UpdateCluster(clusterKey string, creator *aws.Creator, config S
630630
if len(config.OvnInternalSubnetConfiguration) > 0 {
631631
// Create a builder for the specific migration type's configuration if necessary
632632
sdnToOvnBuilder := &v1.SdnToOvnClusterMigrationBuilder{}
633-
if _, ok := config.OvnInternalSubnetConfiguration[JoinIpv4]; ok {
634-
sdnToOvnBuilder.JoinIpv4(config.OvnInternalSubnetConfiguration[JoinIpv4])
633+
if _, ok := config.OvnInternalSubnetConfiguration[SubnetConfigJoin]; ok {
634+
sdnToOvnBuilder.JoinIpv4(config.OvnInternalSubnetConfiguration[SubnetConfigJoin])
635635
}
636-
if _, ok := config.OvnInternalSubnetConfiguration[TransitIpv4]; ok {
637-
sdnToOvnBuilder.TransitIpv4(config.OvnInternalSubnetConfiguration[TransitIpv4])
636+
if _, ok := config.OvnInternalSubnetConfiguration[SubnetConfigTransit]; ok {
637+
sdnToOvnBuilder.TransitIpv4(config.OvnInternalSubnetConfiguration[SubnetConfigTransit])
638638
}
639-
if _, ok := config.OvnInternalSubnetConfiguration[MasqueradeIpv4]; ok {
640-
sdnToOvnBuilder.MasqueradeIpv4(config.OvnInternalSubnetConfiguration[MasqueradeIpv4])
639+
if _, ok := config.OvnInternalSubnetConfiguration[SubnetConfigMasquerade]; ok {
640+
sdnToOvnBuilder.MasqueradeIpv4(config.OvnInternalSubnetConfiguration[SubnetConfigMasquerade])
641641
}
642642
requestBuilder.SdnToOvn(sdnToOvnBuilder)
643643
}

pkg/ocm/migrations.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ import (
99
)
1010

1111
const (
12-
TransitIpv4 = "transit_ipv4"
13-
JoinIpv4 = "join_ipv4"
14-
MasqueradeIpv4 = "masquerade_ipv4"
15-
1612
SubnetConfigTransit = "transit"
1713
SubnetConfigMasquerade = "masquerade"
1814
SubnetConfigJoin = "join"

0 commit comments

Comments
 (0)