Skip to content

Commit 15fe320

Browse files
committed
Adding refresh by default
1 parent ec39a01 commit 15fe320

File tree

2 files changed

+50
-10
lines changed

2 files changed

+50
-10
lines changed

install/infra/modules/eks/kubernetes.tf

+32-7
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,42 @@ module "vpc" {
2020
enable_dns_hostnames = true
2121
}
2222

23+
resource "aws_security_group_rule" "eks-worker-ingress-self" {
24+
description = "Allow node to communicate with each other"
25+
from_port = 0
26+
protocol = "-1"
27+
security_group_id = aws_security_group.nodes.id
28+
source_security_group_id = aws_security_group.nodes.id
29+
to_port = 65535
30+
type = "ingress"
31+
}
32+
33+
resource "aws_security_group_rule" "eks-worker-ingress-cluster" {
34+
description = "Allow worker Kubelets and pods to receive communication from the cluster control plane"
35+
from_port = 1025
36+
protocol = "tcp"
37+
security_group_id = aws_security_group.nodes.id
38+
source_security_group_id = aws_security_group.nodes.id
39+
to_port = 65535
40+
type = "ingress"
41+
}
42+
43+
### Worker Node Access to EKS Master
44+
resource "aws_security_group_rule" "eks-cluster-ingress-node-https" {
45+
description = "Allow pods to communicate with the cluster API Server"
46+
from_port = 443
47+
protocol = "tcp"
48+
security_group_id = aws_security_group.nodes.id
49+
source_security_group_id = aws_security_group.nodes.id
50+
to_port = 443
51+
type = "ingress"
52+
}
53+
54+
2355
resource "aws_security_group" "nodes" {
2456
name = "nodes-sg-${var.cluster_name}"
2557
vpc_id = module.vpc.vpc_id
2658

27-
ingress {
28-
from_port = 0
29-
to_port = 0
30-
protocol = "-1"
31-
cidr_blocks = ["0.0.0.0/0"]
32-
}
33-
3459
egress {
3560
from_port = 0
3661
to_port = 0

install/infra/single-cluster/aws/Makefile

+18-3
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,37 @@
66
init:
77
@terraform init
88

9+
touch-kubeconfig:
10+
@touch kubeconfig
11+
12+
cleanup-kubeconfig:
13+
@rm kubeconfig
14+
915
.PHONY: plan
10-
plan: plan-cluster plan-cm-edns
16+
plan: touch-kubeconfig plan-cluster plan-cm-edns cleanup-kubeconfig
1117

1218
.PHONY: apply
1319
apply: apply-cluster apply-tools
1420

1521
.PHONY: destroy
1622
destroy: destroy-tools destroy-cluster
1723

24+
.PHONY: refresh
25+
refresh:
26+
@echo "Refreshing terraform state"
27+
@terraform refresh
28+
@echo ""
29+
@echo "Done!"
30+
1831
.PHONY: output
19-
output: output-done-msg output-url output-nameservers output-registry output-database output-storage output-issuer
32+
output: refresh output-done-msg output-url output-nameservers output-registry output-database output-storage output-issuer
2033

2134
output-done-msg:
35+
@echo ""
36+
@echo ""
2237
@echo "=========================="
2338
@echo "🎉🥳🔥🧡🚀"
24-
@echo "Your cloud infrastructure is ready to install Gitpod. Please visit"
39+
@echo "Your AWS cloud infrastructure is ready to install Gitpod. Please visit"
2540
@echo "https://www.gitpod.io/docs/self-hosted/latest/getting-started#step-4-install-gitpod"
2641
@echo "for your next steps."
2742
@echo "================="

0 commit comments

Comments
 (0)