Skip to content

Commit cbc26ca

Browse files
authored
docs(k8s_cluster): bump k8s version (#2615)
* docs(k8s_cluster): bump k8s version * rename terraform resources
1 parent cd4a365 commit cbc26ca

File tree

2 files changed

+56
-56
lines changed

2 files changed

+56
-56
lines changed

docs/guides/multicloud_cluster_with_baremetal_servers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ as a node by the apiserver. This can be achieved manually ([method A](#method-a-
2626
resource "scaleway_k8s_cluster" "multicloud" {
2727
name = "multicloud-cluster"
2828
type = "multicloud"
29-
version = "1.27.1"
29+
version = "1.29.1"
3030
cni = "kilo"
3131
region = "fr-par"
3232
delete_additional_resources = false

docs/resources/k8s_cluster.md

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ Creates and manages Scaleway Kubernetes clusters. For more information, see [the
1212
### Basic
1313

1414
```terraform
15-
resource "scaleway_vpc_private_network" "hedy" {}
15+
resource "scaleway_vpc_private_network" "pn" {}
1616
17-
resource "scaleway_k8s_cluster" "jack" {
18-
name = "jack"
19-
version = "1.24.3"
17+
resource "scaleway_k8s_cluster" "cluster" {
18+
name = "tf-cluster"
19+
version = "1.29.1"
2020
cni = "cilium"
21-
private_network_id = scaleway_vpc_private_network.hedy.id
21+
private_network_id = scaleway_vpc_private_network.pn.id
2222
delete_additional_resources = false
2323
}
2424
25-
resource "scaleway_k8s_pool" "john" {
26-
cluster_id = scaleway_k8s_cluster.jack.id
27-
name = "john"
25+
resource "scaleway_k8s_pool" "pool" {
26+
cluster_id = scaleway_k8s_cluster.cluster.id
27+
name = "tf-pool"
2828
node_type = "DEV1-M"
2929
size = 1
3030
}
@@ -33,17 +33,17 @@ resource "scaleway_k8s_pool" "john" {
3333
### Multicloud
3434

3535
```terraform
36-
resource "scaleway_k8s_cluster" "henry" {
37-
name = "henry"
36+
resource "scaleway_k8s_cluster" "cluster" {
37+
name = "tf-cluster"
3838
type = "multicloud"
39-
version = "1.24.3"
39+
version = "1.29.1"
4040
cni = "kilo"
4141
delete_additional_resources = false
4242
}
4343
44-
resource "scaleway_k8s_pool" "friend_from_outer_space" {
45-
cluster_id = scaleway_k8s_cluster.henry.id
46-
name = "henry_friend"
44+
resource "scaleway_k8s_pool" "pool" {
45+
cluster_id = scaleway_k8s_cluster.cluster.id
46+
name = "tf-pool"
4747
node_type = "external"
4848
size = 0
4949
min_size = 0
@@ -55,15 +55,15 @@ For a detailed example of how to add or run Elastic Metal servers instead of Ins
5555
### With additional configuration
5656

5757
```terraform
58-
resource "scaleway_vpc_private_network" "hedy" {}
58+
resource "scaleway_vpc_private_network" "pn" {}
5959
60-
resource "scaleway_k8s_cluster" "john" {
61-
name = "john"
62-
description = "my awesome cluster"
63-
version = "1.24.3"
60+
resource "scaleway_k8s_cluster" "cluster" {
61+
name = "tf-cluster"
62+
description = "cluster made in terraform"
63+
version = "1.29.1"
6464
cni = "calico"
65-
tags = ["i'm an awesome tag", "yay"]
66-
private_network_id = scaleway_vpc_private_network.hedy.id
65+
tags = ["terraform"]
66+
private_network_id = scaleway_vpc_private_network.pn.id
6767
delete_additional_resources = false
6868
6969
autoscaler_config {
@@ -77,9 +77,9 @@ resource "scaleway_k8s_cluster" "john" {
7777
}
7878
}
7979
80-
resource "scaleway_k8s_pool" "john" {
81-
cluster_id = scaleway_k8s_cluster.john.id
82-
name = "john"
80+
resource "scaleway_k8s_pool" "pool" {
81+
cluster_id = scaleway_k8s_cluster.cluster.id
82+
name = "tf-pool"
8383
node_type = "DEV1-M"
8484
size = 3
8585
autoscaling = true
@@ -92,29 +92,29 @@ resource "scaleway_k8s_pool" "john" {
9292
### With the kubernetes provider
9393

9494
```terraform
95-
resource "scaleway_vpc_private_network" "hedy" {}
95+
resource "scaleway_vpc_private_network" "pn" {}
9696
97-
resource "scaleway_k8s_cluster" "joy" {
98-
name = "joy"
99-
version = "1.24.3"
100-
cni = "flannel"
101-
private_network_id = scaleway_vpc_private_network.hedy.id
97+
resource "scaleway_k8s_cluster" "cluster" {
98+
name = "tf-cluster"
99+
version = "1.29.1"
100+
cni = "cilium"
101+
private_network_id = scaleway_vpc_private_network.pn.id
102102
delete_additional_resources = false
103103
}
104104
105-
resource "scaleway_k8s_pool" "john" {
106-
cluster_id = scaleway_k8s_cluster.joy.id
107-
name = "john"
105+
resource "scaleway_k8s_pool" "pool" {
106+
cluster_id = scaleway_k8s_cluster.cluster.id
107+
name = "tf-pool"
108108
node_type = "DEV1-M"
109109
size = 1
110110
}
111111
112112
resource "null_resource" "kubeconfig" {
113-
depends_on = [scaleway_k8s_pool.john] # at least one pool here
113+
depends_on = [scaleway_k8s_pool.pool] # at least one pool here
114114
triggers = {
115-
host = scaleway_k8s_cluster.joy.kubeconfig[0].host
116-
token = scaleway_k8s_cluster.joy.kubeconfig[0].token
117-
cluster_ca_certificate = scaleway_k8s_cluster.joy.kubeconfig[0].cluster_ca_certificate
115+
host = scaleway_k8s_cluster.cluster.kubeconfig[0].host
116+
token = scaleway_k8s_cluster.cluster.kubeconfig[0].token
117+
cluster_ca_certificate = scaleway_k8s_cluster.cluster.kubeconfig[0].cluster_ca_certificate
118118
}
119119
}
120120
@@ -133,29 +133,29 @@ It leads the `kubernetes` provider to start creating its objects, but the DNS en
133133
### With the Helm provider
134134

135135
```terraform
136-
resource "scaleway_vpc_private_network" "hedy" {}
136+
resource "scaleway_vpc_private_network" "pn" {}
137137
138-
resource "scaleway_k8s_cluster" "joy" {
139-
name = "joy"
140-
version = "1.24.3"
141-
cni = "flannel"
138+
resource "scaleway_k8s_cluster" "cluster" {
139+
name = "tf-cluster"
140+
version = "1.29.1"
141+
cni = "cilium"
142142
delete_additional_resources = false
143-
private_network_id = scaleway_vpc_private_network.hedy.id
143+
private_network_id = scaleway_vpc_private_network.pn.id
144144
}
145145
146-
resource "scaleway_k8s_pool" "john" {
147-
cluster_id = scaleway_k8s_cluster.joy.id
148-
name = "john"
146+
resource "scaleway_k8s_pool" "pool" {
147+
cluster_id = scaleway_k8s_cluster.cluster.id
148+
name = "tf-pool"
149149
node_type = "DEV1-M"
150150
size = 1
151151
}
152152
153153
resource "null_resource" "kubeconfig" {
154-
depends_on = [scaleway_k8s_pool.john] # at least one pool here
154+
depends_on = [scaleway_k8s_pool.pool] # at least one pool here
155155
triggers = {
156-
host = scaleway_k8s_cluster.joy.kubeconfig[0].host
157-
token = scaleway_k8s_cluster.joy.kubeconfig[0].token
158-
cluster_ca_certificate = scaleway_k8s_cluster.joy.kubeconfig[0].cluster_ca_certificate
156+
host = scaleway_k8s_cluster.cluster.kubeconfig[0].host
157+
token = scaleway_k8s_cluster.cluster.kubeconfig[0].token
158+
cluster_ca_certificate = scaleway_k8s_cluster.cluster.kubeconfig[0].cluster_ca_certificate
159159
}
160160
}
161161
@@ -171,7 +171,7 @@ provider "helm" {
171171
172172
resource "scaleway_lb_ip" "nginx_ip" {
173173
zone = "fr-par-1"
174-
project_id = scaleway_k8s_cluster.joy.project_id
174+
project_id = scaleway_k8s_cluster.cluster.project_id
175175
}
176176
177177
resource "helm_release" "nginx_ingress" {
@@ -346,8 +346,8 @@ $ terraform import scaleway_k8s_cluster.mycluster fr-par/11111111-1111-1111-1111
346346
Before:
347347

348348
```terraform
349-
resource "scaleway_k8s_cluster" "jack" {
350-
name = "jack"
349+
resource "scaleway_k8s_cluster" "cluster" {
350+
name = "tf-cluster"
351351
version = "1.18.0"
352352
cni = "cilium"
353353
@@ -361,8 +361,8 @@ resource "scaleway_k8s_cluster" "jack" {
361361
After:
362362

363363
```terraform
364-
resource "scaleway_k8s_cluster" "jack" {
365-
name = "jack"
364+
resource "scaleway_k8s_cluster" "cluster" {
365+
name = "tf-cluster"
366366
version = "1.18.0"
367367
cni = "cilium"
368368
}

0 commit comments

Comments
 (0)