Skip to content

Commit eb42778

Browse files
authored
Switch default registry from docker.io to quay.io to avoid docker.io’s strict rate limits by default (#1139)
Signed-off-by: kahirokunn <[email protected]>
1 parent 2943a66 commit eb42778

13 files changed

+18
-18
lines changed

api/k0smotron.io/v1beta1/k0smotroncluster_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type ClusterSpec struct {
4040
Replicas int32 `json:"replicas,omitempty"`
4141
// Image defines the k0s image to be deployed. If empty k0smotron
4242
// will pick it automatically. Must not include the image tag.
43-
//+kubebuilder:default=k0sproject/k0s
43+
//+kubebuilder:default=quay.io/k0sproject/k0s
4444
Image string `json:"image,omitempty"`
4545
// ServiceAccount defines the service account to be used by both k0s and etcd StatefulSets.
4646
//+kubebuilder:validation:Optional
@@ -120,7 +120,7 @@ type Mount struct {
120120
}
121121

122122
const (
123-
defaultK0SImage = "k0sproject/k0s"
123+
defaultK0SImage = "quay.io/k0sproject/k0s"
124124
DefaultK0SVersion = "v1.27.9-k0s.0"
125125
DefaultK0SSuffix = "k0s.0"
126126
DefaultEtcdImage = "quay.io/k0sproject/etcd:v3.5.13"

api/k0smotron.io/v1beta1/k0smotroncluster_types_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ func TestClusterSpec_GetImage(t *testing.T) {
3232
{
3333
name: "Nothing given",
3434
spec: &ClusterSpec{},
35-
want: "k0sproject/k0s:v1.27.9-k0s.0",
35+
want: "quay.io/k0sproject/k0s:v1.27.9-k0s.0",
3636
},
3737
{
3838
name: "Only version given with suffix",
3939
spec: &ClusterSpec{
4040
Version: "v1.29.4-k0s.0",
4141
},
42-
want: "k0sproject/k0s:v1.29.4-k0s.0",
42+
want: "quay.io/k0sproject/k0s:v1.29.4-k0s.0",
4343
},
4444
{
4545
name: "Version given without suffix",
4646
spec: &ClusterSpec{
4747
Version: "v1.29.4",
4848
},
49-
want: "k0sproject/k0s:v1.29.4-k0s.0",
49+
want: "quay.io/k0sproject/k0s:v1.29.4-k0s.0",
5050
},
5151
{
5252
name: "Image given without version should use default version",

config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ spec:
242242
Will be detected automatically for service type LoadBalancer.
243243
type: string
244244
image:
245-
default: k0sproject/k0s
245+
default: quay.io/k0sproject/k0s
246246
description: |-
247247
Image defines the k0s image to be deployed. If empty k0smotron
248248
will pick it automatically. Must not include the image tag.

config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ spec:
228228
Will be detected automatically for service type LoadBalancer.
229229
type: string
230230
image:
231-
default: k0sproject/k0s
231+
default: quay.io/k0sproject/k0s
232232
description: |-
233233
Image defines the k0s image to be deployed. If empty k0smotron
234234
will pick it automatically. Must not include the image tag.

config/clusterapi/k0smotron.io/bases/k0smotron.io_clusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ spec:
204204
Will be detected automatically for service type LoadBalancer.
205205
type: string
206206
image:
207-
default: k0sproject/k0s
207+
default: quay.io/k0sproject/k0s
208208
description: |-
209209
Image defines the k0s image to be deployed. If empty k0smotron
210210
will pick it automatically. Must not include the image tag.

config/crd/bases/controlplane/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ spec:
242242
Will be detected automatically for service type LoadBalancer.
243243
type: string
244244
image:
245-
default: k0sproject/k0s
245+
default: quay.io/k0sproject/k0s
246246
description: |-
247247
Image defines the k0s image to be deployed. If empty k0smotron
248248
will pick it automatically. Must not include the image tag.

config/crd/bases/controlplane/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ spec:
228228
Will be detected automatically for service type LoadBalancer.
229229
type: string
230230
image:
231-
default: k0sproject/k0s
231+
default: quay.io/k0sproject/k0s
232232
description: |-
233233
Image defines the k0s image to be deployed. If empty k0smotron
234234
will pick it automatically. Must not include the image tag.

config/crd/bases/k0smotron.io/k0smotron.io_clusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ spec:
204204
Will be detected automatically for service type LoadBalancer.
205205
type: string
206206
image:
207-
default: k0sproject/k0s
207+
default: quay.io/k0sproject/k0s
208208
description: |-
209209
Image defines the k0s image to be deployed. If empty k0smotron
210210
will pick it automatically. Must not include the image tag.

docs/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
name: k0smotron-test
1010
spec:
1111
replicas: 1
12-
image: k0sproject/k0s
12+
image: quay.io/k0sproject/k0s
1313
version: v1.27.1-k0s.0
1414
service:
1515
type: NodePort

docs/resource-reference/controlplane.cluster.x-k8s.io-v1beta1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,7 @@ Will be detected automatically for service type LoadBalancer.<br/>
18161816
Image defines the k0s image to be deployed. If empty k0smotron
18171817
will pick it automatically. Must not include the image tag.<br/>
18181818
<br/>
1819-
<i>Default</i>: k0sproject/k0s<br/>
1819+
<i>Default</i>: quay.io/k0sproject/k0s<br/>
18201820
</td>
18211821
<td>false</td>
18221822
</tr><tr>
@@ -11263,7 +11263,7 @@ Will be detected automatically for service type LoadBalancer.<br/>
1126311263
Image defines the k0s image to be deployed. If empty k0smotron
1126411264
will pick it automatically. Must not include the image tag.<br/>
1126511265
<br/>
11266-
<i>Default</i>: k0sproject/k0s<br/>
11266+
<i>Default</i>: quay.io/k0sproject/k0s<br/>
1126711267
</td>
1126811268
<td>false</td>
1126911269
</tr><tr>

0 commit comments

Comments
 (0)