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

[Backport release-1.30] Handle pushgateway image as any other image #5544

Merged
merged 1 commit into from
Feb 6, 2025
Merged

[Backport release-1.30] Handle pushgateway image as any other image #5544

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
15 changes: 9 additions & 6 deletions pkg/airgap/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,10 @@ import (
"runtime"

"github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
"github.com/k0sproject/k0s/pkg/constant"
)

// GetImageURIs returns all image tags
func GetImageURIs(spec *v1beta1.ClusterSpec, all bool) []string {
pauseImage := v1beta1.ImageSpec{
Image: constant.KubePauseContainerImage,
Version: constant.KubePauseContainerImageVersion,
}

imageURIs := []string{
spec.Images.Calico.CNI.URI(),
Expand All @@ -40,7 +35,15 @@ func GetImageURIs(spec *v1beta1.ClusterSpec, all bool) []string {
spec.Images.KubeRouter.CNI.URI(),
spec.Images.KubeRouter.CNIInstaller.URI(),
spec.Images.MetricsServer.URI(),
pauseImage.URI(),
spec.Images.Pause.URI(),
}

if all {
// Currently we can't determine if the user has enabled the PushGateway via
// config so include it only if all is requested
imageURIs = append(imageURIs,
spec.Images.PushGateway.URI(),
)
}

if spec.Network != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/k0s/v1beta1/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ func (ci *ClusterImages) overrideImageRepositories() {
override(&ci.KubeRouter.CNI)
override(&ci.KubeRouter.CNIInstaller)
override(&ci.Pause)
override(&ci.PushGateway)
}

// CalicoImageSpec config group for calico related image settings
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/k0s/v1beta1/images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) {
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-router:%s", constant.KubeRouterCNIImageVersion), testingConfig.Spec.Images.KubeRouter.CNI.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/cni-node:%s", constant.KubeRouterCNIInstallerImageVersion), testingConfig.Spec.Images.KubeRouter.CNIInstaller.URI())
require.Equal(t, fmt.Sprintf("my.repo/pause:%s", constant.KubePauseContainerImageVersion), testingConfig.Spec.Images.Pause.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/pushgateway-ttl:%s", constant.PushGatewayImageVersion), testingConfig.Spec.Images.PushGateway.URI())
})
t.Run("config_with_custom_images", func(t *testing.T) {
cfg := DefaultClusterConfig()
Expand Down
Loading