Merge pull request #739 from dmage/remove-installer-dep

IR-227: Remove fallback from platformStatus to installer config

Author: openshift-merge-robot

go.mod

@@ -28,7 +28,6 @@ require (
 	github.com/openshift/api v0.0.0-20211215015256-3cf5120f2ce6
 	github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
 	github.com/openshift/client-go v0.0.0-20210916133943-9acee1a0fb83
-	github.com/openshift/installer v0.9.0-master.0.20190726121806-6e8f9c335410
 	github.com/openshift/library-go v0.0.0-20211110085240-047b536a17c6
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0

go.sum

@@ -638,8 +638,6 @@ github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3 h1:65
 github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20210916133943-9acee1a0fb83 h1:TGBy40xVBCqDqvu8gaakva4u+08JtOt/LfekiwbCMyc=
 github.com/openshift/client-go v0.0.0-20210916133943-9acee1a0fb83/go.mod h1:iSeqKIqUKxVec3gV1kNvwS1tjDpzpdP134RimkLc3BE=
-github.com/openshift/installer v0.9.0-master.0.20190726121806-6e8f9c335410 h1:fCXoMmINCITnEVU7yC6iL0nBuajZw0Y7rruyxVxmfzw=
-github.com/openshift/installer v0.9.0-master.0.20190726121806-6e8f9c335410/go.mod h1:VWGgpJgF8DGCKQjbccnigglhZnHtRLCZ6cxqkXN4Ck0=
 github.com/openshift/library-go v0.0.0-20211110085240-047b536a17c6 h1:dAwIJESWIaTAJoWUIAZbMgJIGvMIbBeuKSa/256Tl58=
 github.com/openshift/library-go v0.0.0-20211110085240-047b536a17c6/go.mod h1:b1cKE6TuNqjl7wT0y3W4g0qREuab1mH6WOJm9pT8L/A=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

pkg/client/fake/fixtures.go

@@ -218,7 +218,6 @@ func (f *FixturesBuilder) BuildListers() *client.Listers {
 		OpenShiftConfig:        corev1listers.NewConfigMapLister(f.configMapsIndexer).ConfigMaps("openshift-config"),
 		OpenShiftConfigManaged: corev1listers.NewConfigMapLister(f.configMapsIndexer).ConfigMaps("openshift-config-managed"),
 		RegistryConfigs:        regopv1listers.NewConfigLister(f.registryConfigsIndexer),
-		InstallerConfigMaps:    corev1listers.NewConfigMapLister(f.configMapsIndexer).ConfigMaps("kube-system"),
 		ProxyConfigs:           configv1listers.NewProxyLister(f.proxyConfigsIndexer),
 		Infrastructures:        configv1listers.NewInfrastructureLister(f.infraIndexer),
 	}

pkg/client/listers.go

@@ -26,7 +26,6 @@ type Listers struct {
 	OpenShiftConfig        kcorelisters.ConfigMapNamespaceLister
 	OpenShiftConfigManaged kcorelisters.ConfigMapNamespaceLister
 	RegistryConfigs        regoplisters.ConfigLister
-	InstallerConfigMaps    kcorelisters.ConfigMapNamespaceLister
 	ProxyConfigs           configlisters.ProxyLister
 	Infrastructures        configlisters.InfrastructureLister
 }

pkg/operator/controller.go

@@ -165,11 +165,6 @@ func NewController(
 			c.listers.RegistryConfigs = informer.Lister()
 			return informer.Informer()
 		},
-		func() cache.SharedIndexInformer {
-			informer := kubeSystemKubeInformerFactory.Core().V1().ConfigMaps()
-			c.listers.InstallerConfigMaps = informer.Lister().ConfigMaps(kubeSystemNamespace)
-			return informer.Informer()
-		},
 		func() cache.SharedIndexInformer {
 			informer := configInformerFactory.Config().V1().Infrastructures()
 			c.listers.Infrastructures = informer.Lister()

pkg/storage/util/util.go

@@ -8,12 +8,10 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metaapi "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/yaml"
 
 	configv1 "github.com/openshift/api/config/v1"
 	imageregistryv1 "github.com/openshift/api/imageregistry/v1"
 	operatorapi "github.com/openshift/api/operator/v1"
-	installer "github.com/openshift/installer/pkg/types"
 
 	regopclient "github.com/openshift/cluster-image-registry-operator/pkg/client"
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -64,46 +62,8 @@ func UpdateCondition(cr *imageregistryv1.Config, conditionType string, status op
 
 // GetInfrastructure gets information about the cloud platform that the cluster is
 // installed on including the Type, Region, and other platform specific information.
-// Currently the install config is used as a backup to be compatible with upgrades
-// from 4.1 -> 4.2 when platformStatus did not exist, but should be able to be removed
-// in the future.
 func GetInfrastructure(listers *regopclient.Listers) (*configv1.Infrastructure, error) {
-	infra, err := listers.Infrastructures.Get("cluster")
-	if err != nil {
-		return nil, err
-	}
-
-	if infra.Status.PlatformStatus == nil {
-		infra.Status.PlatformStatus = &configv1.PlatformStatus{
-			//nolint:staticcheck
-			Type: infra.Status.Platform,
-		}
-
-		// TODO: Eventually we should be able to remove our dependency on the install config
-		// but it is needed for now since platformStatus doesn't get set on upgrade
-		// from 4.1 -> 4.2
-		ic, err := listers.InstallerConfigMaps.Get(defaults.ClusterConfigName)
-		if err != nil {
-			return nil, err
-		}
-		installConfig := &installer.InstallConfig{}
-		if err := yaml.NewYAMLOrJSONDecoder(strings.NewReader(string(ic.Data["install-config"])), 100).Decode(installConfig); err != nil {
-			return nil, fmt.Errorf("unable to decode cluster install configuration: %v", err)
-		}
-
-		if installConfig.Platform.AWS != nil {
-			infra.Status.PlatformStatus.AWS = &configv1.AWSPlatformStatus{Region: installConfig.Platform.AWS.Region}
-		}
-
-		if installConfig.Platform.GCP != nil {
-			infra.Status.PlatformStatus.GCP = &configv1.GCPPlatformStatus{
-				Region:    installConfig.Platform.GCP.Region,
-				ProjectID: installConfig.Platform.GCP.ProjectID,
-			}
-		}
-	}
-
-	return infra, nil
+	return listers.Infrastructures.Get("cluster")
 }
 
 // GetValueFromSecret gets value for key in a secret

test/framework/mock/listers/listers.go

@@ -10,10 +10,6 @@ import (
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
 )
 
-const (
-	installerConfigNamespace = "kube-system"
-)
-
 type mockLister struct {
 	listers    regopclient.Listers
 	kubeconfig *restclient.Config
@@ -35,7 +31,6 @@ func (m *mockLister) GetListers() (*regopclient.Listers, error) {
 	}
 
 	m.listers.Secrets = MockSecretNamespaceLister{namespace: defaults.ImageRegistryOperatorNamespace, client: coreClient}
-	m.listers.InstallerConfigMaps = MockConfigMapNamespaceLister{namespace: installerConfigNamespace, client: coreClient}
 	m.listers.Infrastructures = MockInfrastructureLister{client: *configClient}
 	m.listers.OpenShiftConfigManaged = MockConfigMapNamespaceLister{namespace: defaults.OpenShiftConfigManagedNamespace, client: coreClient}