Skip to content

Commit

Permalink
Temporary: Test fixes for k8s 1.28
Browse files Browse the repository at this point in the history
* Use my kube-proxy OCI image

Signed-off-by: Tom Wieczorek <[email protected]>
  • Loading branch information
twz123 committed Aug 30, 2023
1 parent 50358fb commit 8a8241e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkg/apis/k0s/v1beta1/images_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) {
require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig))
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/apiserver-network-proxy-agent:%s", constant.KonnectivityImageVersion), testingConfig.Spec.Images.Konnectivity.URI())
require.Equal(t, fmt.Sprintf("my.repo/metrics-server/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI())
require.Equal(t, fmt.Sprintf("my.repo/twz123/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/coredns:%s", constant.CoreDNSImageVersion), testingConfig.Spec.Images.CoreDNS.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-cni:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.CNI.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-node:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.Node.URI())
Expand All @@ -84,7 +84,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) {
require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig))
require.Equal(t, fmt.Sprintf("my.repo/my-custom-image:%s", constant.KonnectivityImageVersion), testingConfig.Spec.Images.Konnectivity.URI())
require.Equal(t, fmt.Sprintf("my.repo/metrics-server/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI())
require.Equal(t, fmt.Sprintf("my.repo/twz123/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/coredns:%s", constant.CoreDNSImageVersion), testingConfig.Spec.Images.CoreDNS.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-cni:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.CNI.URI())
require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-node:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.Node.URI())
Expand Down
2 changes: 1 addition & 1 deletion pkg/constant/constant_shared.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const (
PushGatewayImageVersion = "1.4.0-k0s.0"
MetricsImage = "registry.k8s.io/metrics-server/metrics-server"
MetricsImageVersion = "v0.6.4"
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
KubeProxyImage = "quay.io/twz123/kube-proxy"
KubeProxyImageVersion = "v1.28.1"
CoreDNSImage = "quay.io/k0sproject/coredns"
CoreDNSImageVersion = "1.10.1"
Expand Down

0 comments on commit 8a8241e

Please sign in to comment.