Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor imagevector package to conform to usage pattern in gardener/gardener #181

Merged
merged 1 commit into from
Aug 21, 2023
Merged

Refactor imagevector package to conform to usage pattern in gardener/gardener #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
!cmd/
!docs/
!example/
!imagevector/
!hack/
!pkg/
!test/
Expand Down
6 changes: 1 addition & 5 deletions charts/images.go → charts/charts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 charts/images.yaml → imagevector/images.yaml
View file
Open in desktop
File renamed without changes.
12 changes: 8 additions & 4 deletions pkg/imagevector/imagevector.go → imagevector/imagevector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down