From f2f219ee7b18e73d87f5712eb5fb654530f253c0 Mon Sep 17 00:00:00 2001 From: siasin Date: Wed, 20 Nov 2024 10:47:35 +0100 Subject: [PATCH] integrated changes from Lionel M --- .secrets.baseline | 6 +- platform/roks/README.md | 6 +- .../roks/images/ibm-cloud-roks-odm.drawio | 348 ++++++++++++++++++ .../roks/terraform/container-openshift.tf | 4 +- platform/roks/terraform/iam-users.tf | 8 +- platform/roks/terraform/networking-vpc.tf | 7 - platform/roks/terraform/odm.auto.tfvars | 3 +- platform/roks/terraform/provider.tf | 4 +- 8 files changed, 363 insertions(+), 23 deletions(-) create mode 100644 platform/roks/images/ibm-cloud-roks-odm.drawio diff --git a/.secrets.baseline b/.secrets.baseline index 74159a0..75a645e 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2024-11-08T08:23:37Z", + "generated_at": "2024-11-20T09:47:21Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -1408,7 +1408,7 @@ "hashed_secret": "ef0ac30957449cec0b3d5cefe691356e5c57bebe", "is_secret": false, "is_verified": false, - "line_number": 39, + "line_number": 38, "type": "Secret Keyword", "verified_result": null }, @@ -1416,7 +1416,7 @@ "hashed_secret": "08e048ce8880fd249f83a794215df8fd33e58401", "is_secret": false, "is_verified": false, - "line_number": 50, + "line_number": 49, "type": "Secret Keyword", "verified_result": null } diff --git a/platform/roks/README.md b/platform/roks/README.md index 06726c9..1096365 100644 --- a/platform/roks/README.md +++ b/platform/roks/README.md @@ -1,8 +1,8 @@ -# Deploying IBM Operational Decision Manager on Redhat Openshift Kubernetes Service on IBM Cloud aka ROKS +# Deploying IBM Operational Decision Manager on a managed OpenShift cluster on IBM Cloud -This project demonstrates how to deploy an IBM® Operational Decision Manager (ODM) clustered topology on Redhat OpenShift Kubernetes Service on IBM Cloud (ROKS), leveraging Kubernetes and Docker technologies. +This project demonstrates how to deploy an IBM® Operational Decision Manager (ODM) clustered topology on a managed OpenShift Service on IBM Cloud, also known as ROKS, leveraging Kubernetes and Docker technologies. -Redhat OpenShift is available on various cloud platforms. More details about all [these availabilities](https://www.redhat.com/en/technologies/cloud-computing/openshift#cloud-services-editions). +Red Hat OpenShift is available on various cloud platforms. More details about all [these availabilities](https://www.redhat.com/en/technologies/cloud-computing/openshift#cloud-services-editions). This tutorial focuses on deploying ODM on the [IBM Cloud platform](https://www.redhat.com/en/technologies/cloud-computing/openshift/ibm). diff --git a/platform/roks/images/ibm-cloud-roks-odm.drawio b/platform/roks/images/ibm-cloud-roks-odm.drawio new file mode 100644 index 0000000..704314f --- /dev/null +++ b/platform/roks/images/ibm-cloud-roks-odm.drawio @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/roks/terraform/container-openshift.tf b/platform/roks/terraform/container-openshift.tf index b2494bd..368a36d 100644 --- a/platform/roks/terraform/container-openshift.tf +++ b/platform/roks/terraform/container-openshift.tf @@ -133,8 +133,8 @@ resource "ibm_container_vpc_cluster" "roks_cluster" { name = format("%s-%s", local.basename, var.openshift_cluster_name) vpc_id = ibm_is_vpc.vpc.id resource_group_id = local.resource_group_id - # Optional: Specify OpenShift version. If not included, 4.15 is used - kube_version = var.openshift_version == "" ? "4.15_openshift" : var.openshift_version + # Optional: Specify OpenShift version. If not included, 4.16 is used + kube_version = var.openshift_version == "" ? "4.16_openshift" : var.openshift_version operating_system = var.openshift_os cos_instance_crn = var.is_openshift_cluster ? ibm_resource_instance.cos_openshift_registry[0].id : null entitlement = var.entitlement diff --git a/platform/roks/terraform/iam-users.tf b/platform/roks/terraform/iam-users.tf index 72ecf14..370e648 100644 --- a/platform/roks/terraform/iam-users.tf +++ b/platform/roks/terraform/iam-users.tf @@ -1,6 +1,6 @@ # invite the users in the account and attach them to their access group -resource "ibm_iam_user_invite" "invite_user" { - users = ["mathias.mouly@fr.ibm.com"] - access_groups = [ibm_iam_access_group.accgrp.id] -} +# resource "ibm_iam_user_invite" "invite_user" { +# users = ["firstname.lasname@fr.ibm.com"] +# access_groups = [ibm_iam_access_group.accgrp.id] +# } diff --git a/platform/roks/terraform/networking-vpc.tf b/platform/roks/terraform/networking-vpc.tf index 3e390e9..c373cf5 100644 --- a/platform/roks/terraform/networking-vpc.tf +++ b/platform/roks/terraform/networking-vpc.tf @@ -8,12 +8,6 @@ variable "create_vpc" { default = true } -variable "vpc_classic_access" { - description = "Classic Access to the VPC" - type = bool - default = false -} - variable "vpc_address_prefix_management" { description = "Default address prefix creation method" type = string @@ -79,7 +73,6 @@ resource "ibm_is_vpc" "vpc" { # Delete all rules attached to default security group and default network ACL # for a new VPC. This attribute has no impact on update. Default = false # no_sg_acl_rules = true - classic_access = var.vpc_classic_access tags = var.tags } diff --git a/platform/roks/terraform/odm.auto.tfvars b/platform/roks/terraform/odm.auto.tfvars index 15770b5..00a7510 100644 --- a/platform/roks/terraform/odm.auto.tfvars +++ b/platform/roks/terraform/odm.auto.tfvars @@ -8,7 +8,6 @@ region = "eu-de" # eu-de for Frankfurt MZR ############################################################################## ## VPC ############################################################################## -vpc_classic_access = false vpc_address_prefix_management = "manual" vpc_enable_public_gateway = true @@ -17,7 +16,7 @@ vpc_enable_public_gateway = true ## Cluster ROKS ############################################################################## # Optional: Specify OpenShift version. If not included, 4.15 is used -openshift_version = "4.15_openshift" +openshift_version = "4.16_openshift" openshift_os = "RHCOS" openshift_machine_flavor = "bx2.4x16" diff --git a/platform/roks/terraform/provider.tf b/platform/roks/terraform/provider.tf index 0a8a7f7..4e1f62a 100644 --- a/platform/roks/terraform/provider.tf +++ b/platform/roks/terraform/provider.tf @@ -3,11 +3,11 @@ ############################################################################## terraform { - # required_version = ">=1.5" + required_version = ">=1.6" required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.67.1" + version = "1.71.2" } } }