Skip to content

Commit

Permalink
[release/v2.22] Bump k8c.io/kubermatic/v2 to 2d9db24e56ab (#5903)
Browse files Browse the repository at this point in the history 
* [release/v2.22] Bump k8c.io/kubermatic/v2 to 2d9db24e56ab

Signed-off-by: Marvin Beckers <[email protected]>

* [release/v2.22] Bump tests to v1.25.9

Signed-off-by: Marvin Beckers <[email protected]>

---------

Signed-off-by: Marvin Beckers <[email protected]>
  • Loading branch information
@embik
embik authored Apr 13, 2023
1 parent ea0a2f8 commit 8614e16
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions modules/api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ require (
github.com/gorilla/securecookie v1.1.1
github.com/gorilla/websocket v1.5.0
github.com/hetznercloud/hcloud-go v1.39.0
github.com/kubermatic/machine-controller v1.56.1
github.com/kubermatic/machine-controller v1.56.2
github.com/minio/minio-go/v7 v7.0.45
github.com/onsi/ginkgo v1.16.5
github.com/open-policy-agent/frameworks/constraint v0.0.0-20221214024800-b745745c4118 // v0.5.1
Expand All @@ -66,7 +66,7 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v3 v3.0.1
k8c.io/kubeone v1.6.0-rc.1.0.20230223102440-e8f511e983d1
k8c.io/operating-system-manager v1.2.0
k8c.io/operating-system-manager v1.2.2
k8c.io/reconciler v0.3.1
k8s.io/api v0.26.1
k8s.io/apiextensions-apiserver v0.26.1
Expand Down Expand Up @@ -102,7 +102,7 @@ replace github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-2022081

replace (
k8c.io/kubeone => k8c.io/kubeone v1.5.0-beta.0.0.20230216134849-7f23d49b8002
k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.22.2-0.20230406124513-b17aad2a0bc4
k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.22.2-0.20230413091739-2d9db24e56ab
)

require (
Expand Down
12 changes: 6 additions & 6 deletions modules/api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kubermatic/machine-controller v1.56.1 h1:kSQTlcTjdApsyX6xOs6yGCEZZrHK2hwyu0mSDrPjeYw=
github.com/kubermatic/machine-controller v1.56.1/go.mod h1:qeI20IOUpkGsBEV8RHu3nJj58mrJlkDWpffD2ffOKxU=
github.com/kubermatic/machine-controller v1.56.2 h1:YH5seBiFBkJtiVwy7pBIcByxZp3E8GpJbtDMbtVr5h0=
github.com/kubermatic/machine-controller v1.56.2/go.mod h1:qeI20IOUpkGsBEV8RHu3nJj58mrJlkDWpffD2ffOKxU=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/labstack/echo/v4 v4.6.1/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k=
Expand Down Expand Up @@ -1342,10 +1342,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8c.io/kubeone v1.5.0-beta.0.0.20230216134849-7f23d49b8002 h1:x94uM0sD4hyXbubuxu1qjtJHm30Qt+OnpcwL8EWbHCc=
k8c.io/kubeone v1.5.0-beta.0.0.20230216134849-7f23d49b8002/go.mod h1:uPtvJZ2qS1Xxi+frzrW0CNB1GNsT6PQJsZBtHG2leEg=
k8c.io/kubermatic/v2 v2.22.2-0.20230406124513-b17aad2a0bc4 h1:t6fhV3FscOQFcFoXAZMqjFGn7508jerN4duO6kVvaKQ=
k8c.io/kubermatic/v2 v2.22.2-0.20230406124513-b17aad2a0bc4/go.mod h1:BhJAJCaSc+fylX2bQ+fEMM5KTgHfClT+2N1ngQ/sp6g=
k8c.io/operating-system-manager v1.2.0 h1:xqqM4x6In2pHsoOo4BIft8VwYHtRD/pgaZ2ZJsIU6SM=
k8c.io/operating-system-manager v1.2.0/go.mod h1:POlB8/WtJ+RJUrnA3Nfbzej+23PlMx9OUvpSnM4fJcU=
k8c.io/kubermatic/v2 v2.22.2-0.20230413091739-2d9db24e56ab h1:bYgHs7Whu/d/d4WhYn3CJq8TwyylPammvf6ewwFR/BI=
k8c.io/kubermatic/v2 v2.22.2-0.20230413091739-2d9db24e56ab/go.mod h1:VbHP/R8zkz3xdTxnBQldphB2CEJsfOF0j/BZ6mW1MOQ=
k8c.io/operating-system-manager v1.2.2 h1:JswDZcye0YFHyXWdpiQFaaYqIpc7SsYH9c8+SlL0SxQ=
k8c.io/operating-system-manager v1.2.2/go.mod h1:POlB8/WtJ+RJUrnA3Nfbzej+23PlMx9OUvpSnM4fJcU=
k8c.io/reconciler v0.3.1 h1:fZ8gFvrDxjsJ6jdKogZVX9Er980EDUYnVPuOna32d0k=
k8c.io/reconciler v0.3.1/go.mod h1:tEnGL+1N4TmlbgvXYgtZerhVU221NnmlUcK3WdOHzLo=
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
Expand Down
8 changes: 4 additions & 4 deletions modules/api/pkg/handler/v2/cluster_default/cluster_default_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestGetEndpoint(t *testing.T) {
),
ExistingAPIUser: test.GenDefaultAPIUser(),
ExpectedHTTPStatusCode: http.StatusOK,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","aws":{}},"version":"v1.25.6","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","aws":{}},"version":"v1.25.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
},
{
Name: "Default cluster for Azure",
Expand All @@ -61,7 +61,7 @@ func TestGetEndpoint(t *testing.T) {
),
ExistingAPIUser: test.GenDefaultAPIUser(),
ExpectedHTTPStatusCode: http.StatusOK,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","azure":{"assignAvailabilitySet":null}},"version":"v1.25.6","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","azure":{"assignAvailabilitySet":null}},"version":"v1.25.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
},
{
Name: "Default cluster for vSphere",
Expand All @@ -72,7 +72,7 @@ func TestGetEndpoint(t *testing.T) {
),
ExistingAPIUser: test.GenDefaultAPIUser(),
ExpectedHTTPStatusCode: http.StatusOK,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","vsphere":{}},"version":"v1.25.6","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","vsphere":{}},"version":"v1.25.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
},
{
Name: "Default cluster for GCP",
Expand All @@ -83,7 +83,7 @@ func TestGetEndpoint(t *testing.T) {
),
ExistingAPIUser: test.GenDefaultAPIUser(),
ExpectedHTTPStatusCode: http.StatusOK,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","gcp":{}},"version":"v1.25.6","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","gcp":{}},"version":"v1.25.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"canal","version":"v3.24"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`,
},
}

Expand Down
8 changes: 4 additions & 4 deletions modules/api/pkg/handler/v2/external_cluster/external_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func TestListClusters(t *testing.T) {
ID: "clusterAbcID",
},
Spec: apiv1.ClusterSpec{
Version: "v1.25.6",
Version: "v1.25.9",
},
Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name},
},
Expand All @@ -316,7 +316,7 @@ func TestListClusters(t *testing.T) {
ID: "clusterDefID",
},
Spec: apiv1.ClusterSpec{
Version: "v1.25.6",
Version: "v1.25.9",
},
Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name},
},
Expand All @@ -339,7 +339,7 @@ func TestListClusters(t *testing.T) {
ID: "clusterAbcID",
},
Spec: apiv1.ClusterSpec{
Version: "v1.25.6",
Version: "v1.25.9",
},
Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name},
},
Expand All @@ -349,7 +349,7 @@ func TestListClusters(t *testing.T) {
ID: "clusterDefID",
},
Spec: apiv1.ClusterSpec{
Version: "v1.25.6",
Version: "v1.25.9",
},
Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name},
},
Expand Down

0 comments on commit 8614e16

Please sign in to comment.