Skip to content

Commit a1498ca

Browse files
committed
Services cluster terraform and kubernetes v1.33.1 updates
Signed-off-by: Koray Oksay <koray.oksay@gmail.com>
1 parent f1ce175 commit a1498ca

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

ci/services/cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
locals {
22
# it can be aquired from:
33
# oci ce node-pool-options get --node-pool-option-id all | jq '.data.sources.[] | select(."source-name" | match("Oracle-Linux-8.10-2025.*OKE-1.32.*"))'
4-
oci_image_id = "ocid1.image.oc1.us-sanjose-1.aaaaaaaakex5p5yb4hudzzvmcoacq2lmjur3rwqmxdsqd4bol4npx2j6x7iq"
4+
oci_image_id = "ocid1.image.oc1.us-sanjose-1.aaaaaaaa3rkpji3z32yqk5jaydjnxrlfwrgb5rqmyzak2ytcctjm7jrwdgya"
55
}
66

77
resource "oci_containerengine_cluster" "service" {

ci/services/cluster/network.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ resource "oci_core_security_list" "svc_lb" {
160160
display_name = "${var.cluster_name}-svclb-seclist"
161161

162162
egress_security_rules {
163+
description = "kube-proxy access"
163164
destination = "10.0.10.0/23"
164165
destination_type = "CIDR_BLOCK"
165166
protocol = "6"
@@ -172,6 +173,7 @@ resource "oci_core_security_list" "svc_lb" {
172173
}
173174

174175
egress_security_rules {
176+
description = "NodePort service access"
175177
destination = "10.0.10.0/23"
176178
destination_type = "CIDR_BLOCK"
177179
protocol = "6"
@@ -184,6 +186,7 @@ resource "oci_core_security_list" "svc_lb" {
184186
}
185187

186188
egress_security_rules {
189+
description = "NodePort service access"
187190
destination = "10.0.10.0/23"
188191
destination_type = "CIDR_BLOCK"
189192
protocol = "6"
@@ -196,6 +199,7 @@ resource "oci_core_security_list" "svc_lb" {
196199
}
197200

198201
egress_security_rules {
202+
description = "NodePort service access"
199203
destination = "10.0.10.0/23"
200204
destination_type = "CIDR_BLOCK"
201205
protocol = "6"
@@ -380,6 +384,7 @@ resource "oci_core_security_list" "node" {
380384
}
381385

382386
ingress_security_rules {
387+
description = "Access kube-proxy"
383388
protocol = "6"
384389
source = "10.0.20.0/24"
385390
source_type = "CIDR_BLOCK"
@@ -392,6 +397,7 @@ resource "oci_core_security_list" "node" {
392397
}
393398

394399
ingress_security_rules {
400+
description = "NodePort service access"
395401
protocol = "6"
396402
source = "10.0.20.0/24"
397403
source_type = "CIDR_BLOCK"
@@ -404,6 +410,7 @@ resource "oci_core_security_list" "node" {
404410
}
405411

406412
ingress_security_rules {
413+
description = "NodePort service access"
407414
protocol = "6"
408415
source = "10.0.20.0/24"
409416
source_type = "CIDR_BLOCK"
@@ -416,6 +423,7 @@ resource "oci_core_security_list" "node" {
416423
}
417424

418425
ingress_security_rules {
426+
description = "NodePort service access"
419427
protocol = "6"
420428
source = "10.0.20.0/24"
421429
source_type = "CIDR_BLOCK"
@@ -467,10 +475,12 @@ resource "oci_core_public_ip" "ingress_ip" {
467475
compartment_id = var.compartment_ocid
468476
lifetime = "RESERVED"
469477
display_name = "${var.cluster_name}-ingress-ip"
478+
private_ip_id = "ocid1.privateip.oc1.us-sanjose-1.abzwuljrkimbtnfaj5jjpepkmp4ifttqcltnmdldwvzviicmsk5foxp4oiwa"
470479
}
471480

472481
resource "oci_core_public_ip" "kcp_lb_ip" {
473482
compartment_id = var.compartment_ocid
474483
lifetime = "RESERVED"
475484
display_name = "${var.cluster_name}-kcp-lp-ip"
485+
private_ip_id = "ocid1.privateip.oc1.us-sanjose-1.abzwuljrzbthnlqawsumhrda7i7ucfivjcirrw565fuomenlknsmcxpvn2ka"
476486
}

ci/services/cluster/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ terraform {
88
required_providers {
99
oci = {
1010
source = "oracle/oci"
11-
version = "7.1.0"
11+
version = "7.21.0"
1212
}
1313
}
1414

ci/services/cluster/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ variable "node_pool_worker_size" {
4848

4949
variable "kubernetes_version" {
5050
type = string
51-
default = "v1.32.1"
51+
default = "v1.33.1"
5252
}
5353

5454
variable "cluster_autoscaler_min" {
@@ -77,4 +77,4 @@ variable "oke_node_cpu" {
7777
type = number
7878
description = "OKE worker node CPUs"
7979
default = 8
80-
}
80+
}

0 commit comments

Comments
 (0)