Skip to content

Commit 2bac3e9

Browse files
committed
Update EKS 1.29
1 parent 2dc907b commit 2bac3e9

File tree

3 files changed

+78
-29
lines changed

3 files changed

+78
-29
lines changed

helm_argo_rollouts.tf

+64-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ resource "helm_release" "argo_rollouts" {
1212
value = true
1313
}
1414

15-
1615
set {
1716
name = "controller.metrics.enabled"
1817
value = true
@@ -39,4 +38,68 @@ resource "helm_release" "argo_rollouts" {
3938
aws_eks_node_group.cluster,
4039
kubernetes_config_map.aws-auth
4140
]
41+
}
42+
43+
resource "kubectl_manifest" "rollouts_gateway" {
44+
yaml_body = <<YAML
45+
apiVersion: networking.istio.io/v1alpha3
46+
kind: Gateway
47+
metadata:
48+
name: argo-gateway
49+
namespace: argo-rollouts
50+
spec:
51+
selector:
52+
istio: ingressgateway
53+
servers:
54+
- port:
55+
number: 80
56+
name: http
57+
protocol: HTTP
58+
hosts:
59+
- ${var.argo_rollouts_virtual_service_host}
60+
YAML
61+
62+
depends_on = [
63+
aws_eks_cluster.eks_cluster,
64+
aws_eks_node_group.cluster,
65+
kubernetes_config_map.aws-auth,
66+
helm_release.istio_base,
67+
helm_release.istiod
68+
]
69+
70+
}
71+
72+
73+
resource "kubectl_manifest" "rollouts_virtual_service" {
74+
yaml_body = <<YAML
75+
apiVersion: networking.istio.io/v1alpha3
76+
kind: VirtualService
77+
metadata:
78+
name: argo-rollouts
79+
namespace: argo-rollouts
80+
spec:
81+
hosts:
82+
- ${var.argo_rollouts_virtual_service_host}
83+
gateways:
84+
- argo-gateway
85+
http:
86+
- match:
87+
- uri:
88+
prefix: /
89+
route:
90+
- destination:
91+
host: argo-rollouts-dashboard
92+
port:
93+
number: 3100
94+
YAML
95+
96+
depends_on = [
97+
aws_eks_cluster.eks_cluster,
98+
aws_eks_node_group.cluster,
99+
kubernetes_config_map.aws-auth,
100+
helm_release.istio_base,
101+
helm_release.istiod,
102+
helm_release.argo_rollouts
103+
]
104+
42105
}

samples/chip/argo/chip-istio-rollout-canary.yml

+2-24
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,6 @@ spec:
2626
app: chip
2727
type: ClusterIP
2828
---
29-
apiVersion: autoscaling/v2beta2
30-
kind: HorizontalPodAutoscaler
31-
metadata:
32-
name: chip
33-
namespace: chip
34-
spec:
35-
maxReplicas: 10
36-
minReplicas: 10
37-
metrics:
38-
- type: Resource
39-
resource:
40-
name: cpu
41-
target:
42-
type: Utilization
43-
averageUtilization: 60
44-
scaleTargetRef:
45-
apiVersion: apps/v1
46-
kind: Deployment
47-
name: chip
48-
---
4929
apiVersion: networking.istio.io/v1alpha3
5030
kind: DestinationRule
5131
metadata:
@@ -76,7 +56,6 @@ spec:
7656
name: http
7757
protocol: HTTP
7858
hosts:
79-
- "chip"
8059
- "chip.k8s.raj.ninja"
8160
- "chip.chip.svc.cluster.local"
8261
---
@@ -89,7 +68,6 @@ spec:
8968
hosts:
9069
- "chip.chip.svc.cluster.local"
9170
- "chip.k8s.raj.ninja"
92-
- "chip"
9371
gateways:
9472
- chip-gateway
9573
http:
@@ -99,7 +77,7 @@ spec:
9977
port:
10078
number: 8080
10179
retries:
102-
attempts: 0
80+
attempts: 1
10381
perTryTimeout: 500ms
10482
retryOn: refused-stream
10583
---
@@ -118,7 +96,7 @@ spec:
11896
port:
11997
number: 8080
12098
retries:
121-
attempts: 0
99+
attempts: 1
122100
perTryTimeout: 500ms
123101
retryOn: refused-stream
124102
---

variables.tf

+12-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variable "aws_region" {
1111
}
1212

1313
variable "k8s_version" {
14-
default = "1.28"
14+
default = "1.29"
1515
}
1616

1717
#########################
@@ -159,6 +159,14 @@ variable "jaeger_virtual_service_host" {
159159
default = "jaeger.k8s.raj.ninja"
160160
}
161161

162+
###############################
163+
### ARGO-ROLLOUTS CONFIGS ###
164+
###############################
165+
166+
variable "argo_rollouts_virtual_service_host" {
167+
type = string
168+
default = "argo-rollouts.k8s.raj.ninja"
169+
}
162170

163171
#########################
164172
### GENERAL TOGGLES ###
@@ -207,19 +215,19 @@ variable "addon_cni_version" {
207215
variable "addon_coredns_version" {
208216
type = string
209217
description = "CoreDNS Version"
210-
default = "v1.10.1-eksbuild.4"
218+
default = "v1.11.1-eksbuild.4"
211219
}
212220

213221
variable "addon_kubeproxy_version" {
214222
type = string
215223
description = "Kubeproxy Version"
216-
default = "v1.28.1-eksbuild.1"
224+
default = "v1.29.0-eksbuild.1"
217225
}
218226

219227
variable "addon_csi_version" {
220228
type = string
221229
description = "CSI Version"
222-
default = "v1.24.0-eksbuild.1"
230+
default = "v1.26.1-eksbuild.1"
223231
}
224232

225233
variable "default_tags" {

0 commit comments

Comments
 (0)