Skip to content

Commit a3461e7

Browse files
neiswneisw
committed
Revert "Merge pull request openshift#8221 from vr4manta/SPLAT-1553"
This reverts commit ee1c8c0, reversing changes made to 4524922.
1 parent 6eece13 commit a3461e7

File tree

26 files changed

+224
-382
lines changed

26 files changed

+224
-382
lines changed

‎cmd/openshift-install/main.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
terminal "golang.org/x/term"
1414
"k8s.io/klog"
1515
klogv2 "k8s.io/klog/v2"
16-
ctrl "sigs.k8s.io/controller-runtime"
1716
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
1817

1918
"github.com/openshift/installer/cmd/openshift-install/command"
@@ -34,8 +33,6 @@ func main() {
3433
fsv2.Set("stderrthreshold", "4")
3534
klogv2.SetOutput(io.Discard)
3635

37-
ctrl.SetLogger(klogv2.Background())
38-
3936
installerMain()
4037
}
4138

‎data/data/install.openshift.io_installconfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4638,7 +4638,7 @@ spec:
46384638
- server
46394639
- user
46404640
type: object
4641-
maxItems: 3
4641+
maxItems: 1
46424642
minItems: 1
46434643
type: array
46444644
type: object

‎pkg/asset/cluster/vsphere/vsphere.go‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,12 @@ import (
99
func Metadata(config *types.InstallConfig) *typesvsphere.Metadata {
1010
terraformPlatform := "vsphere"
1111

12-
metadata := &typesvsphere.Metadata{
12+
// Since currently we only support a single vCenter
13+
// just use the first entry in the VCenters slice.
14+
return &typesvsphere.Metadata{
15+
VCenter: config.VSphere.VCenters[0].Server,
16+
Username: config.VSphere.VCenters[0].Username,
17+
Password: config.VSphere.VCenters[0].Password,
1318
TerraformPlatform: terraformPlatform,
1419
}
15-
16-
vcenterList := []typesvsphere.VCenters{}
17-
for _, vcenter := range config.VSphere.VCenters {
18-
vcenterDef := typesvsphere.VCenters{
19-
VCenter: vcenter.Server,
20-
Username: vcenter.Username,
21-
Password: vcenter.Password,
22-
}
23-
vcenterList = append(vcenterList, vcenterDef)
24-
}
25-
metadata.VCenters = vcenterList
26-
27-
return metadata
2820
}

‎pkg/asset/machines/vsphere/capimachines.go‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,6 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
156156
Object: vsphereMachine,
157157
})
158158

159-
// Need to determine the infrastructure ref since there may be multi vcenters.
160-
clusterName := clusterID
161-
for index, vcenter := range config.Platform.VSphere.VCenters {
162-
if vcenter.Server == providerSpec.Workspace.Server {
163-
clusterName = fmt.Sprintf("%v-%d", clusterID, index)
164-
break
165-
}
166-
}
167-
168-
// Create capi machine for vspheremachine
169159
machine := &capi.Machine{
170160
ObjectMeta: metav1.ObjectMeta{
171161
Namespace: capiutils.Namespace,
@@ -175,7 +165,7 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
175165
},
176166
},
177167
Spec: capi.MachineSpec{
178-
ClusterName: clusterName,
168+
ClusterName: clusterID,
179169
Bootstrap: capi.Bootstrap{
180170
DataSecretName: ptr.To(fmt.Sprintf("%s-%s", clusterID, role)),
181171
},
@@ -225,15 +215,6 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
225215
Object: bootstrapVSphereMachine,
226216
})
227217

228-
// Need to determine the infrastructure ref since there may be multi vcenters.
229-
clusterName := clusterID
230-
for index, vcenter := range config.Platform.VSphere.VCenters {
231-
if vcenter.Server == bootstrapSpec.Server {
232-
clusterName = fmt.Sprintf("%v-%d", clusterID, index)
233-
break
234-
}
235-
}
236-
237218
bootstrapMachine := &capi.Machine{
238219
ObjectMeta: metav1.ObjectMeta{
239220
Name: bootstrapVSphereMachine.Name,
@@ -242,7 +223,7 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
242223
},
243224
},
244225
Spec: capi.MachineSpec{
245-
ClusterName: clusterName,
226+
ClusterName: clusterID,
246227
Bootstrap: capi.Bootstrap{
247228
DataSecretName: ptr.To(fmt.Sprintf("%s-bootstrap", clusterID)),
248229
},

‎pkg/asset/manifests/aws/cluster.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,11 @@ func GenerateClusterAssets(ic *installconfig.InstallConfig, clusterID *installco
276276

277277
return &capiutils.GenerateClusterAssetsOutput{
278278
Manifests: manifests,
279-
InfrastructureRefs: []*corev1.ObjectReference{
280-
{
281-
APIVersion: capa.GroupVersion.String(),
282-
Kind: "AWSCluster",
283-
Name: awsCluster.Name,
284-
Namespace: awsCluster.Namespace,
285-
},
279+
InfrastructureRef: &corev1.ObjectReference{
280+
APIVersion: capa.GroupVersion.String(),
281+
Kind: "AWSCluster",
282+
Name: awsCluster.Name,
283+
Namespace: awsCluster.Namespace,
286284
},
287285
}, nil
288286
}

‎pkg/asset/manifests/azure/cluster.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,11 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
175175

176176
return &capiutils.GenerateClusterAssetsOutput{
177177
Manifests: manifests,
178-
InfrastructureRefs: []*corev1.ObjectReference{
179-
{
180-
APIVersion: capz.GroupVersion.String(),
181-
Kind: "AzureCluster",
182-
Name: azureCluster.Name,
183-
Namespace: azureCluster.Namespace,
184-
},
178+
InfrastructureRef: &corev1.ObjectReference{
179+
APIVersion: capz.GroupVersion.String(),
180+
Kind: "AzureCluster",
181+
Name: azureCluster.Name,
182+
Namespace: azureCluster.Namespace,
185183
},
186184
}, nil
187185
}

‎pkg/asset/manifests/capiutils/manifest.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const (
1313

1414
// GenerateClusterAssetsOutput is the output of GenerateClusterAssets.
1515
type GenerateClusterAssetsOutput struct {
16-
Manifests []*asset.RuntimeFile
17-
InfrastructureRefs []*corev1.ObjectReference
16+
Manifests []*asset.RuntimeFile
17+
InfrastructureRef *corev1.ObjectReference
1818
}
1919

2020
// GenerateMachinesOutput is the output of GenerateMachines.

‎pkg/asset/manifests/cloudproviderconfig.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"sigs.k8s.io/yaml"
1313

14-
"github.com/openshift/api/features"
1514
"github.com/openshift/installer/pkg/asset"
1615
"github.com/openshift/installer/pkg/asset/installconfig"
1716
ibmcloudmachines "github.com/openshift/installer/pkg/asset/machines/ibmcloud"
@@ -315,15 +314,7 @@ func (cpc *CloudProviderConfig) Generate(dependencies asset.Parents) error {
315314
}
316315
cm.Data[cloudProviderConfigDataKey] = powervsConfig
317316
case vspheretypes.Name:
318-
var vsphereConfig string
319-
var err error
320-
// When we GA multi vcenter, we should only support yaml generation here.
321-
if installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateVSphereMultiVCenters) {
322-
vsphereConfig, err = vspheremanifests.CloudProviderConfigYaml(clusterID.InfraID, installConfig.Config.Platform.VSphere)
323-
} else {
324-
vsphereConfig, err = vspheremanifests.CloudProviderConfigIni(clusterID.InfraID, installConfig.Config.Platform.VSphere)
325-
}
326-
317+
vsphereConfig, err := vspheremanifests.CloudProviderConfigIni(clusterID.InfraID, installConfig.Config.Platform.VSphere)
327318
if err != nil {
328319
return errors.Wrap(err, "could not create cloud provider config")
329320
}

‎pkg/asset/manifests/clusterapi/cluster.go‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"strings"
77

88
"github.com/pkg/errors"
9-
"github.com/sirupsen/logrus"
109
corev1 "k8s.io/api/core/v1"
1110
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1211
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -87,6 +86,20 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
8786
namespace.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Namespace"))
8887
c.FileList = append(c.FileList, &asset.RuntimeFile{Object: namespace, File: asset.File{Filename: "000_capi-namespace.yaml"}})
8988

89+
cluster := &clusterv1.Cluster{
90+
ObjectMeta: metav1.ObjectMeta{
91+
Name: clusterID.InfraID,
92+
Namespace: capiutils.Namespace,
93+
},
94+
Spec: clusterv1.ClusterSpec{
95+
ClusterNetwork: &clusterv1.ClusterNetwork{
96+
APIServerPort: ptr.To[int32](6443),
97+
},
98+
},
99+
}
100+
cluster.SetGroupVersionKind(clusterv1.GroupVersion.WithKind("Cluster"))
101+
c.FileList = append(c.FileList, &asset.RuntimeFile{Object: cluster, File: asset.File{Filename: "01_capi-cluster.yaml"}})
102+
90103
var out *capiutils.GenerateClusterAssetsOutput
91104
switch platform := installConfig.Config.Platform.Name(); platform {
92105
case awstypes.Name:
@@ -136,28 +149,12 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
136149
return fmt.Errorf("unsupported platform %q", platform)
137150
}
138151

139-
if len(out.InfrastructureRefs) == 0 {
152+
// Set the infrastructure reference in the Cluster object.
153+
cluster.Spec.InfrastructureRef = out.InfrastructureRef
154+
if cluster.Spec.InfrastructureRef == nil {
140155
return fmt.Errorf("failed to generate manifests: cluster.Spec.InfrastructureRef was never set")
141156
}
142157

143-
logrus.Infof("Adding clusters...")
144-
for index, infra := range out.InfrastructureRefs {
145-
cluster := &clusterv1.Cluster{
146-
ObjectMeta: metav1.ObjectMeta{
147-
Name: infra.Name,
148-
Namespace: capiutils.Namespace,
149-
},
150-
Spec: clusterv1.ClusterSpec{
151-
ClusterNetwork: &clusterv1.ClusterNetwork{
152-
APIServerPort: ptr.To[int32](6443),
153-
},
154-
},
155-
}
156-
cluster.Spec.InfrastructureRef = infra
157-
cluster.SetGroupVersionKind(clusterv1.GroupVersion.WithKind("Cluster"))
158-
c.FileList = append(c.FileList, &asset.RuntimeFile{Object: cluster, File: asset.File{Filename: fmt.Sprintf("01_capi-cluster-%d.yaml", index)}})
159-
}
160-
161158
// Append the infrastructure manifests.
162159
c.FileList = append(c.FileList, out.Manifests...)
163160

‎pkg/asset/manifests/gcp/cluster.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,11 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
133133

134134
return &capiutils.GenerateClusterAssetsOutput{
135135
Manifests: manifests,
136-
InfrastructureRefs: []*corev1.ObjectReference{
137-
{
138-
APIVersion: capg.GroupVersion.String(),
139-
Kind: "GCPCluster",
140-
Name: gcpCluster.Name,
141-
Namespace: gcpCluster.Namespace,
142-
},
136+
InfrastructureRef: &corev1.ObjectReference{
137+
APIVersion: capg.GroupVersion.String(),
138+
Kind: "GCPCluster",
139+
Name: gcpCluster.Name,
140+
Namespace: gcpCluster.Namespace,
143141
},
144142
}, nil
145143
}

0 commit comments

Comments
 (0)