Skip to content

Commit 07be37d

Browse files
rblaine95bryantbiggs
rblaine95
and
bryantbiggs
authored
chore: Fix typo in nodeadm examples (#2986)
* Fix `nodeadm` example typo * `apiVersion: node.eks.aws/v1alpha` -> `apiVersion: node.eks.aws/v1alpha1` * Revert whitespace changes * `tofu apply` in `examples/user_data` * chore: Fix file extension type for MIME multipart user data * chore: Fix line endings based off this hashicorp/terraform#32910 --------- Co-authored-by: Bryant Biggs <[email protected]>
1 parent 70866e6 commit 07be37d

File tree

13 files changed

+123
-122
lines changed

13 files changed

+123
-122
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

‎examples/eks_managed_node_group/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ module "eks" {
9999
content_type = "application/node.eks.aws"
100100
content = <<-EOT
101101
---
102-
apiVersion: node.eks.aws/v1alpha
102+
apiVersion: node.eks.aws/v1alpha1
103103
kind: NodeConfig
104104
spec:
105105
kubelet:

‎examples/self_managed_node_group/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module "eks" {
8282
content_type = "application/node.eks.aws"
8383
content = <<-EOT
8484
---
85-
apiVersion: node.eks.aws/v1alpha
85+
apiVersion: node.eks.aws/v1alpha1
8686
kind: NodeConfig
8787
spec:
8888
kubelet:

‎examples/user_data/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ module "eks_mng_al2023_additional" {
125125
cloudinit_pre_nodeadm = [{
126126
content = <<-EOT
127127
---
128-
apiVersion: node.eks.aws/v1alpha
128+
apiVersion: node.eks.aws/v1alpha1
129129
kind: NodeConfig
130130
spec:
131131
kubelet:
@@ -153,7 +153,7 @@ module "eks_mng_al2023_custom_ami" {
153153
cloudinit_pre_nodeadm = [{
154154
content = <<-EOT
155155
---
156-
apiVersion: node.eks.aws/v1alpha
156+
apiVersion: node.eks.aws/v1alpha1
157157
kind: NodeConfig
158158
spec:
159159
kubelet:
@@ -189,7 +189,7 @@ module "eks_mng_al2023_custom_template" {
189189
cloudinit_pre_nodeadm = [{
190190
content = <<-EOT
191191
---
192-
apiVersion: node.eks.aws/v1alpha
192+
apiVersion: node.eks.aws/v1alpha1
193193
kind: NodeConfig
194194
spec:
195195
kubelet:
@@ -467,7 +467,7 @@ module "self_mng_al2023_bootstrap" {
467467
cloudinit_pre_nodeadm = [{
468468
content = <<-EOT
469469
---
470-
apiVersion: node.eks.aws/v1alpha
470+
apiVersion: node.eks.aws/v1alpha1
471471
kind: NodeConfig
472472
spec:
473473
kubelet:
@@ -505,7 +505,7 @@ module "self_mng_al2023_custom_template" {
505505
cloudinit_pre_nodeadm = [{
506506
content = <<-EOT
507507
---
508-
apiVersion: node.eks.aws/v1alpha
508+
apiVersion: node.eks.aws/v1alpha1
509509
kind: NodeConfig
510510
spec:
511511
kubelet:

‎examples/user_data/outputs.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ resource "local_file" "eks_mng_al2_no_op" {
1717

1818
resource "local_file" "eks_mng_al2_additional" {
1919
content = base64decode(module.eks_mng_al2_additional.user_data)
20-
filename = "${path.module}/rendered/al2/eks-mng-additional.sh"
20+
filename = "${path.module}/rendered/al2/eks-mng-additional.txt"
2121
}
2222

2323
resource "local_file" "eks_mng_al2_custom_ami" {
@@ -41,22 +41,22 @@ resource "local_file" "eks_mng_al2_custom_template" {
4141

4242
resource "local_file" "eks_mng_al2023_no_op" {
4343
content = base64decode(module.eks_mng_al2023_no_op.user_data)
44-
filename = "${path.module}/rendered/al2023/eks-mng-no-op.sh"
44+
filename = "${path.module}/rendered/al2023/eks-mng-no-op.txt"
4545
}
4646

4747
resource "local_file" "eks_mng_al2023_additional" {
4848
content = base64decode(module.eks_mng_al2023_additional.user_data)
49-
filename = "${path.module}/rendered/al2023/eks-mng-additional.sh"
49+
filename = "${path.module}/rendered/al2023/eks-mng-additional.txt"
5050
}
5151

5252
resource "local_file" "eks_mng_al2023_custom_ami" {
5353
content = base64decode(module.eks_mng_al2023_custom_ami.user_data)
54-
filename = "${path.module}/rendered/al2023/eks-mng-custom-ami.sh"
54+
filename = "${path.module}/rendered/al2023/eks-mng-custom-ami.txt"
5555
}
5656

5757
resource "local_file" "eks_mng_al2023_custom_template" {
5858
content = base64decode(module.eks_mng_al2023_custom_template.user_data)
59-
filename = "${path.module}/rendered/al2023/eks-mng-custom-template.sh"
59+
filename = "${path.module}/rendered/al2023/eks-mng-custom-template.txt"
6060
}
6161

6262
################################################################################
@@ -137,17 +137,17 @@ resource "local_file" "self_mng_al2_custom_template" {
137137

138138
resource "local_file" "self_mng_al2023_no_op" {
139139
content = base64decode(module.self_mng_al2023_no_op.user_data)
140-
filename = "${path.module}/rendered/al2023/self-mng-no-op.sh"
140+
filename = "${path.module}/rendered/al2023/self-mng-no-op.txt"
141141
}
142142

143143
resource "local_file" "self_mng_al2023_bootstrap" {
144144
content = base64decode(module.self_mng_al2023_bootstrap.user_data)
145-
filename = "${path.module}/rendered/al2023/self-mng-bootstrap.sh"
145+
filename = "${path.module}/rendered/al2023/self-mng-bootstrap.txt"
146146
}
147147

148148
resource "local_file" "self_mng_al2023_custom_template" {
149149
content = base64decode(module.self_mng_al2023_custom_template.user_data)
150-
filename = "${path.module}/rendered/al2023/self-mng-custom-template.sh"
150+
filename = "${path.module}/rendered/al2023/self-mng-custom-template.txt"
151151
}
152152

153153
################################################################################

‎examples/user_data/rendered/al2/eks-mng-additional.sh renamed to ‎examples/user_data/rendered/al2/eks-mng-additional.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Content-Type: multipart/mixed; boundary="//"
2-
MIME-Version: 1.0
3-
4-
--//
5-
Content-Transfer-Encoding: 7bit
6-
Content-Type: text/x-shellscript
7-
Mime-Version: 1.0
8-
2+
MIME-Version: 1.0
3+
4+
--//
5+
Content-Transfer-Encoding: 7bit
6+
Content-Type: text/x-shellscript
7+
Mime-Version: 1.0
8+
99
export USE_MAX_PODS=false
10-
11-
--//--
10+
11+
--//--

‎examples/user_data/rendered/al2023/eks-mng-additional.sh renamed to ‎examples/user_data/rendered/al2023/eks-mng-additional.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
Content-Type: multipart/mixed; boundary="MIMEBOUNDARY"
2-
MIME-Version: 1.0
3-
4-
--MIMEBOUNDARY
5-
Content-Transfer-Encoding: 7bit
6-
Content-Type: application/node.eks.aws
7-
Mime-Version: 1.0
8-
2+
MIME-Version: 1.0
3+
4+
--MIMEBOUNDARY
5+
Content-Transfer-Encoding: 7bit
6+
Content-Type: application/node.eks.aws
7+
Mime-Version: 1.0
8+
99
---
10-
apiVersion: node.eks.aws/v1alpha
10+
apiVersion: node.eks.aws/v1alpha1
1111
kind: NodeConfig
1212
spec:
1313
kubelet:
1414
config:
1515
shutdownGracePeriod: 30s
1616
featureGates:
1717
DisableKubeletCloudCredentialProviders: true
18-
19-
--MIMEBOUNDARY--
18+
19+
--MIMEBOUNDARY--

‎examples/user_data/rendered/al2023/self-mng-bootstrap.sh renamed to ‎examples/user_data/rendered/al2023/eks-mng-custom-ami.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
Content-Type: multipart/mixed; boundary="MIMEBOUNDARY"
2-
MIME-Version: 1.0
3-
4-
--MIMEBOUNDARY
5-
Content-Transfer-Encoding: 7bit
6-
Content-Type: application/node.eks.aws
7-
Mime-Version: 1.0
8-
2+
MIME-Version: 1.0
3+
4+
--MIMEBOUNDARY
5+
Content-Transfer-Encoding: 7bit
6+
Content-Type: application/node.eks.aws
7+
Mime-Version: 1.0
8+
99
---
10-
apiVersion: node.eks.aws/v1alpha
10+
apiVersion: node.eks.aws/v1alpha1
1111
kind: NodeConfig
1212
spec:
1313
kubelet:
1414
config:
1515
shutdownGracePeriod: 30s
1616
featureGates:
1717
DisableKubeletCloudCredentialProviders: true
18-
19-
--MIMEBOUNDARY
20-
Content-Transfer-Encoding: 7bit
21-
Content-Type: application/node.eks.aws
22-
Mime-Version: 1.0
23-
18+
19+
--MIMEBOUNDARY
20+
Content-Transfer-Encoding: 7bit
21+
Content-Type: application/node.eks.aws
22+
Mime-Version: 1.0
23+
2424
---
2525
apiVersion: node.eks.aws/v1alpha1
2626
kind: NodeConfig
@@ -30,12 +30,12 @@ spec:
3030
apiServerEndpoint: https://012345678903AB2BAE5D1E0BFE0E2B50.gr7.us-east-1.eks.amazonaws.com
3131
certificateAuthority: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKbXFqQ1VqNGdGR2w3ZW5PeWthWnZ2RjROOTVOUEZCM2o0cGhVZUsrWGFtN2ZSQnZya0d6OGxKZmZEZWF2b2plTwpQK2xOZFlqdHZncmxCUEpYdHZIZmFzTzYxVzdIZmdWQ2EvamdRM2w3RmkvL1dpQmxFOG9oWUZkdWpjc0s1SXM2CnNkbk5KTTNYUWN2TysrSitkV09NT2ZlNzlsSWdncmdQLzgvRU9CYkw3eUY1aU1hS3lsb1RHL1V3TlhPUWt3ZUcKblBNcjdiUmdkQ1NCZTlXYXowOGdGRmlxV2FOditsTDhsODBTdFZLcWVNVlUxbjQyejVwOVpQRTd4T2l6L0xTNQpYV2lXWkVkT3pMN0xBWGVCS2gzdkhnczFxMkI2d1BKZnZnS1NzWllQRGFpZTloT1NNOUJkNFNPY3JrZTRYSVBOCkVvcXVhMlYrUDRlTWJEQzhMUkVWRDdCdVZDdWdMTldWOTBoL3VJUy9WU2VOcEdUOGVScE5DakszSjc2aFlsWm8KWjNGRG5QWUY0MWpWTHhiOXF0U1ROdEp6amYwWXBEYnFWci9xZzNmQWlxbVorMzd3YWM1eHlqMDZ4cmlaRUgzZgpUM002d2lCUEVHYVlGeWN5TmNYTk5aYW9DWDJVL0N1d2JsUHAKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==
3232
cidr: 192.168.0.0/16
33-
34-
--MIMEBOUNDARY
35-
Content-Transfer-Encoding: 7bit
36-
Content-Type: text/x-shellscript; charset="us-ascii"
37-
Mime-Version: 1.0
38-
33+
34+
--MIMEBOUNDARY
35+
Content-Transfer-Encoding: 7bit
36+
Content-Type: text/x-shellscript; charset="us-ascii"
37+
Mime-Version: 1.0
38+
3939
echo "All done"
40-
41-
--MIMEBOUNDARY--
40+
41+
--MIMEBOUNDARY--

‎examples/user_data/rendered/al2023/self-mng-custom-template.sh renamed to ‎examples/user_data/rendered/al2023/eks-mng-custom-template.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
Content-Type: multipart/mixed; boundary="MIMEBOUNDARY"
2-
MIME-Version: 1.0
3-
4-
--MIMEBOUNDARY
5-
Content-Transfer-Encoding: 7bit
6-
Content-Type: application/node.eks.aws
7-
Mime-Version: 1.0
8-
2+
MIME-Version: 1.0
3+
4+
--MIMEBOUNDARY
5+
Content-Transfer-Encoding: 7bit
6+
Content-Type: application/node.eks.aws
7+
Mime-Version: 1.0
8+
99
---
10-
apiVersion: node.eks.aws/v1alpha
10+
apiVersion: node.eks.aws/v1alpha1
1111
kind: NodeConfig
1212
spec:
1313
kubelet:
1414
config:
1515
shutdownGracePeriod: 30s
1616
featureGates:
1717
DisableKubeletCloudCredentialProviders: true
18-
19-
--MIMEBOUNDARY
20-
Content-Transfer-Encoding: 7bit
21-
Content-Type: application/node.eks.aws
22-
Mime-Version: 1.0
23-
18+
19+
--MIMEBOUNDARY
20+
Content-Transfer-Encoding: 7bit
21+
Content-Type: application/node.eks.aws
22+
Mime-Version: 1.0
23+
2424
---
2525
apiVersion: node.eks.aws/v1alpha1
2626
kind: NodeConfig
@@ -34,12 +34,12 @@ spec:
3434
config: |
3535
[plugins."io.containerd.grpc.v1.cri".containerd]
3636
discard_unpacked_layers = false
37-
38-
--MIMEBOUNDARY
39-
Content-Transfer-Encoding: 7bit
40-
Content-Type: text/x-shellscript; charset="us-ascii"
41-
Mime-Version: 1.0
42-
37+
38+
--MIMEBOUNDARY
39+
Content-Transfer-Encoding: 7bit
40+
Content-Type: text/x-shellscript; charset="us-ascii"
41+
Mime-Version: 1.0
42+
4343
echo "All done"
44-
45-
--MIMEBOUNDARY--
44+
45+
--MIMEBOUNDARY--

‎examples/user_data/rendered/al2023/eks-mng-no-op.sh renamed to ‎examples/user_data/rendered/al2023/eks-mng-no-op.txt

File renamed without changes.

‎examples/user_data/rendered/al2023/eks-mng-custom-ami.sh renamed to ‎examples/user_data/rendered/al2023/self-mng-bootstrap.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
Content-Type: multipart/mixed; boundary="MIMEBOUNDARY"
2-
MIME-Version: 1.0
3-
4-
--MIMEBOUNDARY
5-
Content-Transfer-Encoding: 7bit
6-
Content-Type: application/node.eks.aws
7-
Mime-Version: 1.0
8-
2+
MIME-Version: 1.0
3+
4+
--MIMEBOUNDARY
5+
Content-Transfer-Encoding: 7bit
6+
Content-Type: application/node.eks.aws
7+
Mime-Version: 1.0
8+
99
---
10-
apiVersion: node.eks.aws/v1alpha
10+
apiVersion: node.eks.aws/v1alpha1
1111
kind: NodeConfig
1212
spec:
1313
kubelet:
1414
config:
1515
shutdownGracePeriod: 30s
1616
featureGates:
1717
DisableKubeletCloudCredentialProviders: true
18-
19-
--MIMEBOUNDARY
20-
Content-Transfer-Encoding: 7bit
21-
Content-Type: application/node.eks.aws
22-
Mime-Version: 1.0
23-
18+
19+
--MIMEBOUNDARY
20+
Content-Transfer-Encoding: 7bit
21+
Content-Type: application/node.eks.aws
22+
Mime-Version: 1.0
23+
2424
---
2525
apiVersion: node.eks.aws/v1alpha1
2626
kind: NodeConfig
@@ -30,12 +30,12 @@ spec:
3030
apiServerEndpoint: https://012345678903AB2BAE5D1E0BFE0E2B50.gr7.us-east-1.eks.amazonaws.com
3131
certificateAuthority: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKbXFqQ1VqNGdGR2w3ZW5PeWthWnZ2RjROOTVOUEZCM2o0cGhVZUsrWGFtN2ZSQnZya0d6OGxKZmZEZWF2b2plTwpQK2xOZFlqdHZncmxCUEpYdHZIZmFzTzYxVzdIZmdWQ2EvamdRM2w3RmkvL1dpQmxFOG9oWUZkdWpjc0s1SXM2CnNkbk5KTTNYUWN2TysrSitkV09NT2ZlNzlsSWdncmdQLzgvRU9CYkw3eUY1aU1hS3lsb1RHL1V3TlhPUWt3ZUcKblBNcjdiUmdkQ1NCZTlXYXowOGdGRmlxV2FOditsTDhsODBTdFZLcWVNVlUxbjQyejVwOVpQRTd4T2l6L0xTNQpYV2lXWkVkT3pMN0xBWGVCS2gzdkhnczFxMkI2d1BKZnZnS1NzWllQRGFpZTloT1NNOUJkNFNPY3JrZTRYSVBOCkVvcXVhMlYrUDRlTWJEQzhMUkVWRDdCdVZDdWdMTldWOTBoL3VJUy9WU2VOcEdUOGVScE5DakszSjc2aFlsWm8KWjNGRG5QWUY0MWpWTHhiOXF0U1ROdEp6amYwWXBEYnFWci9xZzNmQWlxbVorMzd3YWM1eHlqMDZ4cmlaRUgzZgpUM002d2lCUEVHYVlGeWN5TmNYTk5aYW9DWDJVL0N1d2JsUHAKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==
3232
cidr: 192.168.0.0/16
33-
34-
--MIMEBOUNDARY
35-
Content-Transfer-Encoding: 7bit
36-
Content-Type: text/x-shellscript; charset="us-ascii"
37-
Mime-Version: 1.0
38-
33+
34+
--MIMEBOUNDARY
35+
Content-Transfer-Encoding: 7bit
36+
Content-Type: text/x-shellscript; charset="us-ascii"
37+
Mime-Version: 1.0
38+
3939
echo "All done"
40-
41-
--MIMEBOUNDARY--
40+
41+
--MIMEBOUNDARY--

0 commit comments

Comments
 (0)