Update image builder AMI

Signed-off-by: Alexandr Demicev <[email protected]>
rancher · Aug 13, 2024 · a1f7bb1 · a1f7bb1
1 parent 0bc8d6c
commit a1f7bb1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/image-builder/Makefile b/image-builder/Makefile
@@ -55,7 +55,7 @@ endif
 ## Platform and version combinations
 ## --------------------------------------
 
-AWS_BUILD_NAMES ?= aws-opensuse-leap-155
+AWS_BUILD_NAMES ?= aws-opensuse-leap-156
 
 ## --------------------------------------
 ## Dynamic build targets
@@ -71,5 +71,5 @@ $(AWS_BUILD_TARGETS):
 ## Document dynamic build targets
 ## --------------------------------------
 ##@ Builds
-build-aws-opensuse-leap-155: ## Builds an AMI for OpenSUSE Leap 15.5
+build-aws-opensuse-leap-156: ## Builds an AMI for OpenSUSE Leap 15.6
 build-aws-all: $(AWS_BUILD_TARGETS) ## Builds all AMIs
diff --git a/image-builder/aws/opensuse-leap-155.json → image-builder/aws/opensuse-leap-156.json b/image-builder/aws/opensuse-leap-155.json → image-builder/aws/opensuse-leap-156.json
@@ -1,11 +1,11 @@
 {
-    "ami_filter_name": "openSUSE-Leap-15-5-v20240311-hvm-ssd-x86_64-5535c495-72d4-4355-b169-54ffa874f849",
+    "ami_filter_name": "openSUSE-Leap-15-6-v20240703-hvm-ssd-x86_64-5535c495-72d4-4355-b169-54ffa874f849",
     "ami_filter_owners": "679593333241",
     "ami_regions": "us-west-1",
-    "build_name": "openSUSE-leap-15.5-rke2",
+    "build_name": "openSUSE-leap-15.6-rke2",
     "distribution": "openSUSE",
     "distribution_release": "Leap",
-    "distribution_version": "15.5",
+    "distribution_version": "15.6",
     "root_device_name": "/dev/sda1",
     "source_ami": "",
     "ssh_username": "ec2-user",

diff --git a/samples/aws/cluster-template.yaml b/samples/aws/cluster-template.yaml
@@ -79,6 +79,33 @@ spec:
       natGatewaysIPsSource: true
       protocol: tcp
       toPort: 2380
+    - description: Calico Typha
+      fromPort: 5473
+      protocol: tcp
+      toPort: 5473
+      sourceSecurityGroupRoles:
+      - node
+      - controlplane
+      - apiserver-lb
+      - lb
+    - description: Calico Typha health check
+      fromPort: 9098
+      protocol: tcp
+      toPort: 9098
+      sourceSecurityGroupRoles:
+      - node
+      - controlplane
+      - apiserver-lb
+      - lb
+    - description: Calico health check
+      fromPort: 9099
+      protocol: tcp
+      toPort: 9099
+      sourceSecurityGroupRoles:
+      - node
+      - controlplane
+      - apiserver-lb
+      - lb
     vpc:
       availabilityZoneUsageLimit: 1
   region: ${AWS_REGION}