First version of module #3

vbontempi · 2024-02-05T16:15:09Z

Description

This PR allows the module to deploy the IBM WebSphere Liberty operator into an IBM Cloud Openshift cluster.
It is possible to deploy the operator in all the configurations supported by the operator: OwnNamespace, SingleNamespace, and AllNamespaces (more information available at https://www.ibm.com/docs/en/was-liberty/core?topic=operator-installing-red-hat-openshift-cli)

The module supports also to deploy the Liberty sample app to verify its deployment.

Release required?

No release
Patch release (x.x.X)
Minor release (x.X.x)
Major release (X.x.x)

Release notes content

Enable the module to deploy the IBM WebSphere Liberty operator into an IBM Cloud Openshift cluster in all the configurations supported by the operator: OwnNamespace, SingleNamespace, and AllNamespaces (more information available at https://www.ibm.com/docs/en/was-liberty/core?topic=operator-installing-red-hat-openshift-cli)
Support for deploy the Liberty sample app.

Run the pipeline

If the CI pipeline doesn't run when you create the PR, the PR requires a user with GitHub collaborators access to run the pipeline.

Run the CI pipeline when the PR is ready for review and you expect tests to pass. Add a comment to the PR with the following text:

/run pipeline

Checklist for reviewers

If relevant, a test for the change is included or updated with this PR.
If relevant, documentation for the change is included or updated with this PR.

For mergers

Use a conventional commit message to set the release level. Follow the guidelines.
Include information that users need to know about the PR in the commit message. The commit message becomes part of the GitHub release notes.
Use the Squash and merge option.

Co-authored-by: Rajat Agrawal <[email protected]>

…form-ibm-websphere-liberty-operator into add_liberty_operator_support

vbontempi · 2024-02-05T16:16:07Z

/run pipeline

vbontempi · 2024-02-05T17:25:00Z

/run pipeline

vbontempi · 2024-02-05T17:35:03Z

/run pipeline

ocofaigh

@vbontempi You should take same approach as we do in https://github.com/terraform-ibm-modules/terraform-ibm-observability-agents/blob/main/main.tf for handling image versions. The module should have a local variable for each image sha, and should be set up with renovate to be updated. Please reach out to me if you have any questions around this approach.

ocofaigh

I left some comments but this is a huge PR. I will re-review after the code is updated to handle image versions.

examples/complete/README.md

main.tf

scripts/get-sampleapp-url.sh

variables.tf

examples/complete/variables.tf

vbontempi · 2024-02-06T11:47:20Z

/run pipeline

vbontempi · 2024-02-06T13:39:59Z

/run pipeline

rajatagarwal-ibm · 2024-02-06T15:33:54Z

Can you please update the "about" section of the repo in ".github/settings.yml"?

vbontempi · 2024-02-06T17:01:24Z

/run pipeline

…raform-ibm-modules/terraform-ibm-websphere-liberty-operator into add_liberty_operator_support

vbontempi · 2024-02-06T18:03:50Z

/run pipeline

ocofaigh

@SirSpidey We are going to merge as is (if pipeline passes) and follow up with a cleanup for other changes, as we need a release for a demo

ocofaigh

Approving for initial release. Follow up comments can be addressed in #8

ocofaigh · 2024-02-08T16:57:46Z

.github/settings.yml

@@ -22,7 +22,7 @@ repository:

  # Uncomment this description property
  # and update the description to the current repo description.
-  # description: ""
+  description: "This module installs a WebSphere® Liberty operator and create an instance of WebSphere Liberty operator on IBM Cloud Red Hat OpenShift cluster on VPC Gen2."

  # Use a comma-separated list of topics to set on the repo (ensure not to use any caps in the topic string).
  topics: terraform, ibm-cloud, terraform-module


Action for follow up PR:

Add these topics: websphere-liberty-operator, core-team

(NOTE: core-team should only be added if our team own this, which may not be the case)

ocofaigh · 2024-02-08T16:58:01Z

README.md

@@ -1,27 +1,27 @@
 <!-- Update the title -->
-# Terraform Modules Template Project
+# WebSphere Liberty operator on Red Hat OpenShift VPC cluster module


^ Action for follow up PR

ocofaigh · 2024-02-08T16:58:13Z

README.md

 [![latest release](https://img.shields.io/github/v/release/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator?logo=GitHub&sort=semver)](https://github.com/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator/releases/latest)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)

 <!-- Add a description of module(s) in this repo -->
-TODO: Replace me with description of the module(s) in this repo
+Use this module to install a WebSphere® Liberty operator and create an instance of WebSphere Liberty operator on IBM Cloud Red Hat OpenShift cluster on VPC Gen2.


^ Action for follow up PR

ocofaigh · 2024-02-08T17:01:49Z

extensions/landing-zone/catalogValidationValues.json.template

@@ -0,0 +1,4 @@
+{
+  "ibmcloud_api_key": $VALIDATION_APIKEY,
+  "cluster_id": $CLUSTER_ID


Action for follow up PR:

this line needs to be removed, as cluster_id is being added in tests/scripts/pre-validation-slz-roks.sh

ocofaigh · 2024-02-08T17:02:01Z

extensions/landing-zone/main.tf

+
+data "ibm_container_cluster_config" "cluster_config" {
+  cluster_name_id = var.cluster_id
+  # config_dir      = "../../kubeconfig"


Action for follow up PR:

remove comment

ocofaigh · 2024-02-08T17:02:50Z

extensions/landing-zone/variables.tf

+variable "region" {
+  type        = string
+  description = "Region to provision all resources created by this solution"
+  default     = "au-syd"


Action for follow up PR:

I would not have any region here, instead make it required input

ocofaigh · 2024-02-08T17:04:11Z

main.tf

+  create_namespace = false
+  timeout          = 300
+  # dependency_update = true
+  # force_update      = false


Action for follow up PR:

remove comments

ocofaigh · 2024-02-08T17:06:38Z

renovate.json

+        "tests/resources/**"
+      ]
+    }
+  ]


Action for follow up PR:

Add a rule to bump ICR image versions (see https://github.com/terraform-ibm-modules/terraform-ibm-observability-agents/blob/main/renovate.json)

ocofaigh · 2024-02-08T17:07:19Z

scripts/get-sampleapp-url.sh

+
+# jq reads from stdin
+function parse_input() {
+  eval "$(jq -r '@sh "export KUBECONFIG=\(.KUBECONFIG) APPNAMESPACE=\(.APPNAMESPACE) APPNAME=\(.APPNAME)"')"


Action for follow up PR:

Clearly document that jq is required in main readme

ocofaigh · 2024-02-08T17:07:57Z

scripts/get-sampleapp-url.sh

+    # shellcheck disable=SC2129
+    echo "[INFO] using APPNAME ${APPNAME}" >> "${DEBUGFILE}"
+
+    SAMPLEAPPROUTE="$(oc get routes "${APPNAME}" -n "${APPNAMESPACE}" --no-headers | awk '{print $2}')"


leave it for now, but lets revisit

ocofaigh · 2024-02-08T17:59:27Z

/run pipeline

vbontempi · 2024-02-08T20:08:42Z

/run pipeline

vbontempi · 2024-02-08T20:26:51Z

/run pipeline

vbontempi · 2024-02-08T20:43:46Z

/run pipeline

vbontempi · 2024-02-08T20:58:05Z

/run pipeline

vbontempi · 2024-02-08T21:04:50Z

/run pipeline

vbontempi · 2024-02-08T21:06:55Z

/run pipeline

vbontempi · 2024-02-08T21:13:51Z

/run pipeline

vbontempi · 2024-02-08T21:25:37Z

/run pipeline

ocofaigh · 2024-02-08T22:57:27Z

The apply completed successfully on the cluster, but there seemed to be an issue with the subsequent plan:

Error: [0m Error: [ERROR] Error downloading the cluster config [cn2khmaz0n010b7bbv3g]: Request failed with status code: 400, ServerErrorResponse: {"error":"server_error","error_description":"The authorization server encountered an unexpected condition that prevented it from fulfilling the request."}

It may have been a network or backend glitch, but since apply completed, we are going to force merge this in order to continue progress. We will be following this up with a cleanup PR anyway where we can address any issues we find.

terraform-ibm-modules-ops · 2024-02-08T23:01:18Z

🎉 This PR is included in version 1.0.0 🎉

The release is available on:

GitHub release
v1.0.0

Your semantic-release bot 📦🚀

vbontempi and others added 9 commits January 31, 2024 18:40

feat: first draft

11000b1

feat: second draft

e6bd3d7

feat: added script to retrieve and output sample app url

79122fd

feat: da ibm catalog (#1)

8c807ba

Co-authored-by: Rajat Agrawal <[email protected]>

feat: added example and test and extension

f47c201

feat: added sleep before reading sampleapp URL

d49b581

Merge branch 'main' of https://github.com/terraform-ibm-modules/terra…

49e6319

…form-ibm-websphere-liberty-operator into add_liberty_operator_support

feat: adjusted prtest conf

93d761a

feat: removed subnets from basic test output

ea2b285

vbontempi requested review from ocofaigh and vburckhardt February 5, 2024 16:15

fixed: moved basic example to complete folder SKIP UPGRADE TEST

39f20f0

fix: removed pub gw from complete test cluster

fa9bdee

ocofaigh reviewed Feb 6, 2024

View reviewed changes

ocofaigh requested changes Feb 6, 2024

View reviewed changes

examples/complete/README.md Outdated Show resolved Hide resolved

main.tf Show resolved Hide resolved

scripts/get-sampleapp-url.sh Outdated Show resolved Hide resolved

variables.tf Outdated Show resolved Hide resolved

examples/complete/variables.tf Outdated Show resolved Hide resolved

feat: added back LBs in complete test

67b7602

fix: test to validate SCC scan

ab1023a

feat: reference architecture (#5)

e32fa0e

feat: added cleanup hooks and addressed PR comments

6e41c16

vbontempi added 2 commits February 6, 2024 18:01

Merge branch 'add_liberty_operator_support' of https://github.com/ter…

1de4d69

…raform-ibm-modules/terraform-ibm-websphere-liberty-operator into add_liberty_operator_support

fix: fixed description on GH setting

fcbd7be

vbontempi marked this pull request as ready for review February 6, 2024 18:03

ocofaigh reviewed Feb 8, 2024

View reviewed changes

This was referenced Feb 8, 2024

Initial release follow up actions #8

Closed

feat: catalog onboarding #10

Merged

ocofaigh previously approved these changes Feb 8, 2024

View reviewed changes

catalog onboarding (#10)

7ef5358

ocofaigh dismissed their stale review via 7ef5358 February 8, 2024 17:59

ocofaigh previously approved these changes Feb 8, 2024

View reviewed changes

fix: making SLZ test with public nw access

8993651

vbontempi dismissed ocofaigh’s stale review via 8993651 February 8, 2024 20:08

fix: fixed override json

65f844a

fix: reduced override json to vpc settings only

0a4b705

fix: fixed override json

bc31c82

fix: setting custom override json

579742a

fix: setting reduced override json

4c7240b

fix: setting custom override json

c668e71

fix: setting custom override json

1f1f9f4

ocofaigh merged commit 3817c01 into main Feb 8, 2024
1 of 2 checks passed

ocofaigh deleted the add_liberty_operator_support branch February 8, 2024 22:59

terraform-ibm-modules-ops added the released label Feb 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

First version of module #3

First version of module #3

vbontempi commented Feb 5, 2024

vbontempi commented Feb 5, 2024

vbontempi commented Feb 5, 2024

vbontempi commented Feb 5, 2024

ocofaigh left a comment

ocofaigh left a comment

vbontempi commented Feb 6, 2024

vbontempi commented Feb 6, 2024

rajatagarwal-ibm commented Feb 6, 2024 •

edited

Loading

vbontempi commented Feb 6, 2024

vbontempi commented Feb 6, 2024

ocofaigh left a comment

ocofaigh left a comment

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh Feb 8, 2024

ocofaigh commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

ocofaigh commented Feb 8, 2024

terraform-ibm-modules-ops commented Feb 8, 2024

First version of module #3

First version of module #3

Conversation

vbontempi commented Feb 5, 2024

Description

Release required?

Release notes content

Run the pipeline

Checklist for reviewers

For mergers

vbontempi commented Feb 5, 2024

vbontempi commented Feb 5, 2024

vbontempi commented Feb 5, 2024

ocofaigh left a comment

Choose a reason for hiding this comment

ocofaigh left a comment

Choose a reason for hiding this comment

vbontempi commented Feb 6, 2024

vbontempi commented Feb 6, 2024

rajatagarwal-ibm commented Feb 6, 2024 • edited Loading

vbontempi commented Feb 6, 2024

vbontempi commented Feb 6, 2024

ocofaigh left a comment

Choose a reason for hiding this comment

ocofaigh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ocofaigh commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

vbontempi commented Feb 8, 2024

ocofaigh commented Feb 8, 2024

terraform-ibm-modules-ops commented Feb 8, 2024

rajatagarwal-ibm commented Feb 6, 2024 •

edited

Loading