refactoring imagevector to conform to usage pattern in gardener/garde…

…ner (gardener#181)

.dockerignore

@@ -6,6 +6,7 @@
 !cmd/
 !docs/
 !example/
+!imagevector/
 !hack/
 !pkg/
 !test/

charts/images.go → charts/charts.go

@@ -16,14 +16,10 @@ package charts
 
 import (
 	"embed"
-	_ "embed"
 )
 
-// Images YAML contains the contents of the images.yaml file.
-//go:embed images.yaml
-var ImagesYAML string
-
 // Internal contains the internal charts
+//
 //go:embed internal
 var Internal embed.FS
 

pkg/imagevector/imagevector.go → imagevector/imagevector.go

@@ -15,18 +15,22 @@
 package imagevector
 
 import (
+	_ "embed"
+
 	"github.com/gardener/gardener/pkg/utils/imagevector"
 	"k8s.io/apimachinery/pkg/util/runtime"
-
-	"github.com/gardener/gardener-extension-shoot-cert-service/charts"
 )
 
-var imageVector imagevector.ImageVector
+var (
+	//go:embed images.yaml
+	imagesYAML  string
+	imageVector imagevector.ImageVector
+)
 
 func init() {
 	var err error
 
-	imageVector, err = imagevector.Read([]byte(charts.ImagesYAML))
+	imageVector, err = imagevector.Read([]byte(imagesYAML))
 	runtime.Must(err)
 
 	imageVector, err = imagevector.WithEnvOverride(imageVector)

pkg/controller/actuator.go

@@ -45,11 +45,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/gardener/gardener-extension-shoot-cert-service/charts"
+	"github.com/gardener/gardener-extension-shoot-cert-service/imagevector"
 	"github.com/gardener/gardener-extension-shoot-cert-service/pkg/apis/config"
 	"github.com/gardener/gardener-extension-shoot-cert-service/pkg/apis/service"
 	"github.com/gardener/gardener-extension-shoot-cert-service/pkg/apis/service/v1alpha1"
 	"github.com/gardener/gardener-extension-shoot-cert-service/pkg/apis/service/validation"
-	"github.com/gardener/gardener-extension-shoot-cert-service/pkg/imagevector"
 )
 
 // ActuatorName is the name of the Certificate Service actuator.