remove references to OPENSHIFT_DEFAULT_REGISTRY

OPENSHIFT_DEFAULT_REGISTRY has been deprecated and is removed by openshift/image-registry#378
flavianmissi · Sep 6, 2023 · 333e50e · 333e50e
1 parent 8891815
commit 333e50e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 32 deletions.
diff --git a/config/v1/0000_10_config-operator_01_image.crd.yaml b/config/v1/0000_10_config-operator_01_image.crd.yaml
@@ -100,7 +100,7 @@ spec:
                   items:
                     type: string
                 internalRegistryHostname:
-                  description: internalRegistryHostname sets the hostname for the default internal image registry. The value must be in "hostname[:port]" format. This value is set by the image registry operator which controls the internal registry hostname. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this setting overrides the environment variable.
+                  description: internalRegistryHostname sets the hostname for the default internal image registry. The value must be in "hostname[:port]" format. This value is set by the image registry operator which controls the internal registry hostname.
                   type: string
       served: true
       storage: true

diff --git a/config/v1/types_image.go b/config/v1/types_image.go
@@ -64,12 +64,10 @@ type ImageSpec struct {
 }
 
 type ImageStatus struct {
-
 	// internalRegistryHostname sets the hostname for the default internal image
 	// registry. The value must be in "hostname[:port]" format.
 	// This value is set by the image registry operator which controls the internal registry
-	// hostname. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
-	// environment variable but this setting overrides the environment variable.
+	// hostname.
 	// +optional
 	InternalRegistryHostname string `json:"internalRegistryHostname,omitempty"`
 

diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go
diff --git a/kubecontrolplane/v1/types.go b/kubecontrolplane/v1/types.go
@@ -1,10 +1,10 @@
 package v1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"fmt"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	configv1 "github.com/openshift/api/config/v1"
 	osinv1 "github.com/openshift/api/osin/v1"
 )
@@ -76,8 +76,6 @@ func (t Arguments) String() string {
 type KubeAPIServerImagePolicyConfig struct {
 	// internalRegistryHostname sets the hostname for the default internal image
 	// registry. The value must be in "hostname[:port]" format.
-	// For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
-	// environment variable but this setting overrides the environment variable.
 	InternalRegistryHostname string `json:"internalRegistryHostname"`
 	// externalRegistryHostnames provides the hostnames for the default external image
 	// registry. The external hostname should be set only when the image registry

diff --git a/kubecontrolplane/v1/zz_generated.swagger_doc_generated.go b/kubecontrolplane/v1/zz_generated.swagger_doc_generated.go
diff --git a/legacyconfig/v1/types.go b/legacyconfig/v1/types.go
@@ -414,8 +414,6 @@ type ImagePolicyConfig struct {
 	AllowedRegistriesForImport *AllowedRegistries `json:"allowedRegistriesForImport,omitempty"`
 	// InternalRegistryHostname sets the hostname for the default internal image
 	// registry. The value must be in "hostname[:port]" format.
-	// For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
-	// environment variable but this setting overrides the environment variable.
 	InternalRegistryHostname string `json:"internalRegistryHostname,omitempty"`
 	// ExternalRegistryHostname sets the hostname for the default external image
 	// registry. The external hostname should be set only when the image registry
@@ -442,7 +440,7 @@ type RegistryLocation struct {
 	Insecure bool `json:"insecure,omitempty"`
 }
 
-//  holds the necessary configuration options for
+// holds the necessary configuration options for
 type ProjectConfig struct {
 	// DefaultNodeSelector holds default project node label selector
 	DefaultNodeSelector string `json:"defaultNodeSelector"`
@@ -482,7 +480,7 @@ type SecurityAllocator struct {
 	MCSLabelsPerProject int `json:"mcsLabelsPerProject"`
 }
 
-//  holds the necessary configuration options for
+// holds the necessary configuration options for
 type PolicyConfig struct {
 	// UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled.  THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!
 	UserAgentMatchingConfig UserAgentMatchingConfig `json:"userAgentMatchingConfig"`
@@ -737,7 +735,7 @@ type OAuthConfig struct {
 	// AlwaysShowProviderSelection will force the provider selection page to render even when there is only a single provider.
 	AlwaysShowProviderSelection bool `json:"alwaysShowProviderSelection"`
 
-	//IdentityProviders is an ordered list of ways for a user to identify themselves
+	// IdentityProviders is an ordered list of ways for a user to identify themselves
 	IdentityProviders []IdentityProvider `json:"identityProviders"`
 
 	// GrantConfig describes how to handle grants
@@ -1563,7 +1561,6 @@ type BuildDefaultsConfig struct {
 // SourceStrategyDefaultsConfig contains values that apply to builds using the
 // source strategy.
 type SourceStrategyDefaultsConfig struct {
-
 	// incremental indicates if s2i build strategies should perform an incremental
 	// build or not
 	Incremental *bool `json:"incremental,omitempty"`

diff --git a/legacyconfig/v1/zz_generated.swagger_doc_generated.go b/legacyconfig/v1/zz_generated.swagger_doc_generated.go
diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -7071,7 +7071,7 @@
           }
         },
         "internalRegistryHostname": {
-          "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. This value is set by the image registry operator which controls the internal registry hostname. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this setting overrides the environment variable.",
+          "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. This value is set by the image registry operator which controls the internal registry hostname.",
           "type": "string"
         }
       }
@@ -13736,7 +13736,7 @@
           }
         },
         "internalRegistryHostname": {
-          "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this setting overrides the environment variable.",
+          "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.",
           "type": "string",
           "default": ""
         }
@@ -15109,7 +15109,7 @@
           "type": "string"
         },
         "internalRegistryHostname": {
-          "description": "InternalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this setting overrides the environment variable.",
+          "description": "InternalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.",
           "type": "string"
         },
         "maxImagesBulkImportedPerRepository": {
@@ -22824,7 +22824,7 @@
           }
         },
         "internalRegistryHostname": {
-          "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this setting overrides the environment variable.",
+          "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.",
           "type": "string",
           "default": ""
         },

diff --git a/openshiftcontrolplane/v1/types.go b/openshiftcontrolplane/v1/types.go
@@ -132,8 +132,6 @@ type ImagePolicyConfig struct {
 
 	// internalRegistryHostname sets the hostname for the default internal image
 	// registry. The value must be in "hostname[:port]" format.
-	// For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
-	// environment variable but this setting overrides the environment variable.
 	InternalRegistryHostname string `json:"internalRegistryHostname"`
 	// externalRegistryHostnames provides the hostnames for the default external image
 	// registry. The external hostname should be set only when the image registry
@@ -194,7 +192,7 @@ type JenkinsPipelineConfig struct {
 
 // OpenShiftControllerName defines a string type used to represent the various
 // OpenShift controllers within openshift-controller-manager. These constants serve as identifiers
-// for the controllers and are used on both openshift/openshift-controller-manager 
+// for the controllers and are used on both openshift/openshift-controller-manager
 // and openshift/cluster-openshift-controller-manager-operator repositories.
 type OpenShiftControllerName string
 
@@ -365,7 +363,6 @@ type BuildDefaultsConfig struct {
 // SourceStrategyDefaultsConfig contains values that apply to builds using the
 // source strategy.
 type SourceStrategyDefaultsConfig struct {
-
 	// incremental indicates if s2i build strategies should perform an incremental
 	// build or not
 	Incremental *bool `json:"incremental,omitempty"`

diff --git a/openshiftcontrolplane/v1/zz_generated.swagger_doc_generated.go b/openshiftcontrolplane/v1/zz_generated.swagger_doc_generated.go