From 1c4b5afa2210159d64999239a4394c0ac6a9e092 Mon Sep 17 00:00:00 2001 From: paulparkinson Date: Tue, 3 Dec 2024 14:58:31 -0500 Subject: [PATCH 1/7] update k8s version to v1.31.1 and image/node_shape version to VM.Standard.E3.Flex --- infra/k8s/oke/terraform/containerengine.tf | 2 +- infra/k8s/oke/terraform/main_var.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/k8s/oke/terraform/containerengine.tf b/infra/k8s/oke/terraform/containerengine.tf index 62d5dde..dcb5e9a 100644 --- a/infra/k8s/oke/terraform/containerengine.tf +++ b/infra/k8s/oke/terraform/containerengine.tf @@ -39,7 +39,7 @@ resource "oci_containerengine_node_pool" "okell_node_pool" { compartment_id = var.ociCompartmentOcid kubernetes_version = var.kubernetes_version name = "Pool" - node_shape = "VM.Standard.E2.1" + node_shape = "VM.Standard.E3.Flex" node_config_details { placement_configs { availability_domain = data.oci_identity_availability_domain.ad1.name diff --git a/infra/k8s/oke/terraform/main_var.tf b/infra/k8s/oke/terraform/main_var.tf index 2278add..4ebfde0 100644 --- a/infra/k8s/oke/terraform/main_var.tf +++ b/infra/k8s/oke/terraform/main_var.tf @@ -9,5 +9,5 @@ variable "vcnOcid" {} variable "kubernetes_version" { description = "OKE Version" type = string - default = "v1.29.1" + default = "v1.31.1" } From 5b303201d48267389f5a11230cf32bb0ae426021 Mon Sep 17 00:00:00 2001 From: paulparkinson Date: Tue, 3 Dec 2024 17:51:08 -0500 Subject: [PATCH 2/7] update k8s version to v1.28.2 --- infra/k8s/oke/terraform/main_var.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/k8s/oke/terraform/main_var.tf b/infra/k8s/oke/terraform/main_var.tf index 4ebfde0..9799648 100644 --- a/infra/k8s/oke/terraform/main_var.tf +++ b/infra/k8s/oke/terraform/main_var.tf @@ -9,5 +9,5 @@ variable "vcnOcid" {} variable "kubernetes_version" { description = "OKE Version" type = string - default = "v1.31.1" + default = "v1.28.2" } From 1df7cf665ae6870fb15c6562783630258d4d4115 Mon Sep 17 00:00:00 2001 From: paulparkinson Date: Tue, 3 Dec 2024 21:21:19 -0500 Subject: [PATCH 3/7] update k8s version to v1.28.2 --- infra/k8s/oke/terraform/containerengine.tf | 6 ++++++ infra/k8s/oke/terraform/main_var.tf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/infra/k8s/oke/terraform/containerengine.tf b/infra/k8s/oke/terraform/containerengine.tf index dcb5e9a..e28e808 100644 --- a/infra/k8s/oke/terraform/containerengine.tf +++ b/infra/k8s/oke/terraform/containerengine.tf @@ -51,6 +51,12 @@ resource "oci_containerengine_node_pool" "okell_node_pool" { image_id = local.oracle_linux_images.0 # Latest source_type = "IMAGE" } + + node_shape_config { + memory_in_gbs = 16 # Specify the memory size in GBs + ocpus = 1 # Specify the number of OCPUs + } + } data "oci_containerengine_node_pool_option" "okell_node_pool_option" { diff --git a/infra/k8s/oke/terraform/main_var.tf b/infra/k8s/oke/terraform/main_var.tf index 9799648..4ebfde0 100644 --- a/infra/k8s/oke/terraform/main_var.tf +++ b/infra/k8s/oke/terraform/main_var.tf @@ -9,5 +9,5 @@ variable "vcnOcid" {} variable "kubernetes_version" { description = "OKE Version" type = string - default = "v1.28.2" + default = "v1.31.1" } From c7b69a21c83945d28d0e9d29db7fc684077f1615 Mon Sep 17 00:00:00 2001 From: paulparkinson Date: Wed, 4 Dec 2024 18:50:04 -0500 Subject: [PATCH 4/7] remove OKE auto-provision --- .../dcms-oci/config/threads/k8s/apply.sh | 46 +----------- .../dcms-oci/config/threads/k8s/apply0.sh | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 workshops/dcms-oci/config/threads/k8s/apply0.sh diff --git a/workshops/dcms-oci/config/threads/k8s/apply.sh b/workshops/dcms-oci/config/threads/k8s/apply.sh index 0f10153..586a888 100755 --- a/workshops/dcms-oci/config/threads/k8s/apply.sh +++ b/workshops/dcms-oci/config/threads/k8s/apply.sh @@ -12,7 +12,7 @@ fi # Wait for dependencies -DEPENDENCIES='COMPARTMENT_OCID OCI_REGION TENANCY_OCID OKE_LIMIT_CHECK' +DEPENDENCIES='COMPARTMENT_OCID OCI_REGION TENANCY_OCID' while ! test -z "$DEPENDENCIES"; do echo "Waiting for $DEPENDENCIES" WAITING_FOR="" @@ -24,48 +24,4 @@ while ! test -z "$DEPENDENCIES"; do DEPENDENCIES="$WAITING_FOR" sleep 1 done - - -# Provision the VCN, unless live labs -if ! state_done VCN_OCID; then - if test $(state_get RUN_TYPE) != "LL"; then - # Need to provision network - STATE=$DCMS_INFRA_STATE/network - mkdir -p $STATE - cd $STATE - cat >$STATE/input.env <$STATE/input.env < $OUTPUT_FILE state_set_done K8S_THREAD \ No newline at end of file diff --git a/workshops/dcms-oci/config/threads/k8s/apply0.sh b/workshops/dcms-oci/config/threads/k8s/apply0.sh new file mode 100644 index 0000000..0f10153 --- /dev/null +++ b/workshops/dcms-oci/config/threads/k8s/apply0.sh @@ -0,0 +1,71 @@ +#!/bin/bash +# Copyright (c) 2021 Oracle and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. + +# Fail on error +set -e + + +if ! provisioning-helper-pre-apply; then + exit 1 +fi + + +# Wait for dependencies +DEPENDENCIES='COMPARTMENT_OCID OCI_REGION TENANCY_OCID OKE_LIMIT_CHECK' +while ! test -z "$DEPENDENCIES"; do + echo "Waiting for $DEPENDENCIES" + WAITING_FOR="" + for d in $DEPENDENCIES; do + if ! state_done $d; then + WAITING_FOR="$WAITING_FOR $d" + fi + done + DEPENDENCIES="$WAITING_FOR" + sleep 1 +done + + +# Provision the VCN, unless live labs +if ! state_done VCN_OCID; then + if test $(state_get RUN_TYPE) != "LL"; then + # Need to provision network + STATE=$DCMS_INFRA_STATE/network + mkdir -p $STATE + cd $STATE + cat >$STATE/input.env <$STATE/input.env < $OUTPUT_FILE +state_set_done K8S_THREAD \ No newline at end of file From 4a97806110a244df1466c6625b3d10e48e207e8d Mon Sep 17 00:00:00 2001 From: paulparkinson Date: Wed, 4 Dec 2024 19:05:35 -0500 Subject: [PATCH 5/7] remove OKE auto-provision --- workshops/dcms-oci/config/threads/k8s/apply.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/workshops/dcms-oci/config/threads/k8s/apply.sh b/workshops/dcms-oci/config/threads/k8s/apply.sh index 586a888..1a8615b 100755 --- a/workshops/dcms-oci/config/threads/k8s/apply.sh +++ b/workshops/dcms-oci/config/threads/k8s/apply.sh @@ -24,4 +24,5 @@ while ! test -z "$DEPENDENCIES"; do DEPENDENCIES="$WAITING_FOR" sleep 1 done +echo "" > $OUTPUT_FILE state_set_done K8S_THREAD \ No newline at end of file From 57fa8d210977799be7e4aee51fee5895d333b68e Mon Sep 17 00:00:00 2001 From: paulparkinson Date: Wed, 4 Dec 2024 20:25:43 -0500 Subject: [PATCH 6/7] remove OKE auto-provision --- grabdish/deploy.sh | 2 +- workshops/dcms-oci/config/threads/k8s/apply.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/grabdish/deploy.sh b/grabdish/deploy.sh index bdae69e..b269f1c 100755 --- a/grabdish/deploy.sh +++ b/grabdish/deploy.sh @@ -3,7 +3,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. #MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon inventory-springboot" -MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon foodwinepairing-python" +MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon" for s in $MS; do echo ________________________________________ echo "Deploying $s..." diff --git a/workshops/dcms-oci/config/threads/k8s/apply.sh b/workshops/dcms-oci/config/threads/k8s/apply.sh index 1a8615b..d08abf3 100755 --- a/workshops/dcms-oci/config/threads/k8s/apply.sh +++ b/workshops/dcms-oci/config/threads/k8s/apply.sh @@ -24,5 +24,6 @@ while ! test -z "$DEPENDENCIES"; do DEPENDENCIES="$WAITING_FOR" sleep 1 done +state_set VCN_OCID "NA" echo "" > $OUTPUT_FILE state_set_done K8S_THREAD \ No newline at end of file From 1702b306f310fda723830a97dcab9a9058439cd2 Mon Sep 17 00:00:00 2001 From: paulparkinson Date: Wed, 4 Dec 2024 20:27:34 -0500 Subject: [PATCH 7/7] remove OKE auto-provision --- workshops/dcms-oci/config/threads/k8s/apply.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workshops/dcms-oci/config/threads/k8s/apply.sh b/workshops/dcms-oci/config/threads/k8s/apply.sh index d08abf3..9aa5323 100755 --- a/workshops/dcms-oci/config/threads/k8s/apply.sh +++ b/workshops/dcms-oci/config/threads/k8s/apply.sh @@ -26,4 +26,4 @@ while ! test -z "$DEPENDENCIES"; do done state_set VCN_OCID "NA" echo "" > $OUTPUT_FILE -state_set_done K8S_THREAD \ No newline at end of file +#state_set_done K8S_THREAD \ No newline at end of file