Rename envVar package to overrides

An upcoming change will allow OLM users to set the Volume and
VolumeMounts in operator  deployments via the subscription config field.
There is a fair amount of code that resides in the envvar package that
could be reused.

Author: awgreene

pkg/controller/install/deployment.go

@@ -58,13 +58,13 @@ var _ StrategyInstaller = &StrategyDeploymentInstaller{}
 // initializes it for install.
 //
 // Before a deployment is created on the cluster, we can run a series of
-// initializer functions that will properly initialize the deployment object.
+// overrides functions that will properly initialize the deployment object.
 type DeploymentInitializerFunc func(deployment *appsv1.Deployment) error
 
 // DeploymentInitializerFuncChain defines a chain of DeploymentInitializerFunc.
 type DeploymentInitializerFuncChain []DeploymentInitializerFunc
 
-// Apply runs series of initializer functions that will properly initialize
+// Apply runs series of overrides functions that will properly initialize
 // the deployment object.
 func (c DeploymentInitializerFuncChain) Apply(deployment *appsv1.Deployment) (err error) {
 	for _, initializer := range c {

pkg/controller/operators/olm/operator.go

@@ -34,7 +34,7 @@ import (
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/informers/externalversions"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/certs"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/envvar"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/overrides"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver"
 	csvutility "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/csv"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/event"
@@ -476,7 +476,7 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 		op.RegisterQueueInformer(informer)
 	}
 
-	proxyEnvInjector := envvar.NewDeploymentInitializer(op.logger, proxyQuerierInUse, op.lister)
+	proxyEnvInjector := overrides.NewDeploymentInitializer(op.logger, proxyQuerierInUse, op.lister)
 	op.resolver = &install.StrategyResolver{
 		ProxyInjectorBuilderFunc: proxyEnvInjector.GetDeploymentInitializer,
 	}

pkg/controller/operators/olm/envvar/config.go renamed to pkg/controller/operators/olm/overrides/config.go

@@ -1,4 +1,4 @@
-package envvar
+package overrides
 
 import (
 	"fmt"

pkg/controller/operators/olm/envvar/initializer.go renamed to pkg/controller/operators/olm/overrides/initializer.go

@@ -1,4 +1,4 @@
-package envvar
+package overrides
 
 import (
 	"fmt"

pkg/controller/operators/olm/envvar/inject.go renamed to pkg/controller/operators/olm/overrides/inject.go

@@ -1,4 +1,4 @@
-package envvar
+package overrides
 
 import (
 	"errors"

pkg/controller/operators/olm/envvar/inject_test.go renamed to pkg/controller/operators/olm/overrides/inject_test.go

@@ -1,9 +1,9 @@
-package envvar_test
+package overrides_test
 
 import (
 	"testing"
 
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/envvar"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/overrides"
 
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
@@ -229,7 +229,7 @@ func TestInjectEnvIntoDeployment(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			envvar.InjectEnvIntoDeployment(tt.podSpec, tt.envVar)
+			overrides.InjectEnvIntoDeployment(tt.podSpec, tt.envVar)
 
 			podSpecWant := tt.expected
 			podSpecGot := tt.podSpec

pkg/package-server/provider/manifests/prometheus/0.14.0/alertmanager.crd.yaml

@@ -1436,11 +1436,11 @@ spec:
                     pending:
                       description: Pending is a list of initializers that must execute
                         in order before this object is visible. When the last pending
-                        initializer is removed, and no failing result is set, the
+                        overrides is removed, and no failing result is set, the
                         initializers struct will be set to nil and the object is considered
                         as initialized and visible to all clients.
                       items:
-                        description: Initializer is information about an initializer
+                        description: Initializer is information about an overrides
                           that has not yet completed.
                         properties:
                           name:
@@ -1937,12 +1937,12 @@ spec:
                             pending:
                               description: Pending is a list of initializers that
                                 must execute in order before this object is visible.
-                                When the last pending initializer is removed, and
+                                When the last pending overrides is removed, and
                                 no failing result is set, the initializers struct
                                 will be set to nil and the object is considered as
                                 initialized and visible to all clients.
                               items:
-                                description: Initializer is information about an initializer
+                                description: Initializer is information about an overrides
                                   that has not yet completed.
                                 properties:
                                   name:

pkg/package-server/provider/manifests/prometheus/0.14.0/prometheus.crd.yaml

@@ -1524,11 +1524,11 @@ spec:
                     pending:
                       description: Pending is a list of initializers that must execute
                         in order before this object is visible. When the last pending
-                        initializer is removed, and no failing result is set, the
+                        overrides is removed, and no failing result is set, the
                         initializers struct will be set to nil and the object is considered
                         as initialized and visible to all clients.
                       items:
-                        description: Initializer is information about an initializer
+                        description: Initializer is information about an overrides
                           that has not yet completed.
                         properties:
                           name:
@@ -2439,12 +2439,12 @@ spec:
                             pending:
                               description: Pending is a list of initializers that
                                 must execute in order before this object is visible.
-                                When the last pending initializer is removed, and
+                                When the last pending overrides is removed, and
                                 no failing result is set, the initializers struct
                                 will be set to nil and the object is considered as
                                 initialized and visible to all clients.
                               items:
-                                description: Initializer is information about an initializer
+                                description: Initializer is information about an overrides
                                   that has not yet completed.
                                 properties:
                                   name:

pkg/package-server/provider/manifests/prometheus/0.15.0/alertmanager.crd.yaml

@@ -1436,11 +1436,11 @@ spec:
                     pending:
                       description: Pending is a list of initializers that must execute
                         in order before this object is visible. When the last pending
-                        initializer is removed, and no failing result is set, the
+                        overrides is removed, and no failing result is set, the
                         initializers struct will be set to nil and the object is considered
                         as initialized and visible to all clients.
                       items:
-                        description: Initializer is information about an initializer
+                        description: Initializer is information about an overrides
                           that has not yet completed.
                         properties:
                           name:
@@ -1937,12 +1937,12 @@ spec:
                             pending:
                               description: Pending is a list of initializers that
                                 must execute in order before this object is visible.
-                                When the last pending initializer is removed, and
+                                When the last pending overrides is removed, and
                                 no failing result is set, the initializers struct
                                 will be set to nil and the object is considered as
                                 initialized and visible to all clients.
                               items:
-                                description: Initializer is information about an initializer
+                                description: Initializer is information about an overrides
                                   that has not yet completed.
                                 properties:
                                   name:

pkg/package-server/provider/manifests/prometheus/0.15.0/prometheus.crd.yaml

@@ -1524,11 +1524,11 @@ spec:
                     pending:
                       description: Pending is a list of initializers that must execute
                         in order before this object is visible. When the last pending
-                        initializer is removed, and no failing result is set, the
+                        overrides is removed, and no failing result is set, the
                         initializers struct will be set to nil and the object is considered
                         as initialized and visible to all clients.
                       items:
-                        description: Initializer is information about an initializer
+                        description: Initializer is information about an overrides
                           that has not yet completed.
                         properties:
                           name:
@@ -2439,12 +2439,12 @@ spec:
                             pending:
                               description: Pending is a list of initializers that
                                 must execute in order before this object is visible.
-                                When the last pending initializer is removed, and
+                                When the last pending overrides is removed, and
                                 no failing result is set, the initializers struct
                                 will be set to nil and the object is considered as
                                 initialized and visible to all clients.
                               items:
-                                description: Initializer is information about an initializer
+                                description: Initializer is information about an overrides
                                   that has not yet completed.
                                 properties:
                                   name: