diff --git a/pkg/operator/osimagestream_ocp.go b/pkg/operator/osimagestream.go similarity index 99% rename from pkg/operator/osimagestream_ocp.go rename to pkg/operator/osimagestream.go index 0da4a99835..7e1e9bb9ea 100644 --- a/pkg/operator/osimagestream_ocp.go +++ b/pkg/operator/osimagestream.go @@ -1,5 +1,3 @@ -//go:build !fcos && !scos - package operator import ( diff --git a/pkg/operator/osimagestream_okd.go b/pkg/operator/osimagestream_okd.go deleted file mode 100644 index af41f6dda6..0000000000 --- a/pkg/operator/osimagestream_okd.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build fcos || scos - -package operator - -import ( - configv1 "github.com/openshift/api/config/v1" - "k8s.io/klog/v2" -) - -func (optr *Operator) syncOSImageStream(_ *renderConfig, _ *configv1.ClusterOperator) error { - klog.V(4).Info("OSImageStream sync skipped") - return nil -} diff --git a/pkg/osimagestream/helpers.go b/pkg/osimagestream/helpers.go index 107a462138..ac349cfdec 100644 --- a/pkg/osimagestream/helpers.go +++ b/pkg/osimagestream/helpers.go @@ -6,7 +6,6 @@ import ( "github.com/openshift/api/features" "github.com/openshift/api/machineconfiguration/v1alpha1" "github.com/openshift/machine-config-operator/pkg/controller/common" - "github.com/openshift/machine-config-operator/pkg/version" k8serrors "k8s.io/apimachinery/pkg/api/errors" ) @@ -39,7 +38,7 @@ func GetOSImageStreamSetByName(osImageStream *v1alpha1.OSImageStream, name strin } // IsFeatureEnabled checks if the OSImageStream feature is enabled. -// Returns true only if the FeatureGateOSStreams is enabled and the cluster is not running SCOS or FCOS. +// Returns true only if the FeatureGateOSStreams is enabled. func IsFeatureEnabled(fgHandler common.FeatureGatesHandler) bool { - return fgHandler.Enabled(features.FeatureGateOSStreams) && !version.IsSCOS() && !version.IsFCOS() + return fgHandler.Enabled(features.FeatureGateOSStreams) }