OCP 4.3 support (#34)

* Adds stages-ocp4 directory and updates runTerraform.sh to apply it when cluster_type is ocp4

* Updates ocp3 deploy to use ocp43 modules

* Set all modules to ocp43 version

* Updates runTerraform.sh to handle vlan that doesn't end in an extra new line

* Updates stages for terraform 0.12

* Updates stages to match updates to operator interface

* Updates to stages from ocp4.3 testing and iks and ocp3 regression testing

* Updates to cos and cloudant stages to match module interface

* Applies nooperator changes to ocp4 stages

* Update to scripts/destroy-services.sh

- Looks up and uses service id for the delete so that the process works even if there are multiple services with the same name

* Updates module version numbers to v2.2.0 to get ocp 4.3 support

* Updates handling of namespaces

* Adds Jenkinsfile to run pipeline and script to create required resources

* Updates to create-pipeline-resources.sh
- Makes executable
- Adds NAMESPACE as the first arg
- Sets the script to fail on error
- Deletes the kustomization.yaml if everything succeeds

* Updates image names in Jenkinsfile and updates create-pipeline-resources.sh script

* Adds logic to remove namespace from agent name in Jenkinsfile

* Updates Jenkins file to remove /bin/bash references for alpine container

* Updates Jenkinsfile and configmap to put two files in one configmap

* Updates variable name to release_namespaces

* Updates terraform modules to tagged version to prevent in-flight changes

* Updates config (temporarily) for ocp 4.3

* Updates for iks and ocp3 - testing

* Adds credential*.properties to gitignore. Updates namespace variables

* Updates variables for namespace stages

* Update README.md

Update Wording and replace with Cloud Native Toolkit

* Update README.md

Update team name from IBM Garage to GSE

* Update the diagram for the tools

* Update environment.tfvars

Reset environments.tfvars file

* Updates ref for stage2 modules

* Updates stages for CRC

* Updates Jenkins module to pass ci namespace. Updates postgres and sonarqube modules for crc

* Renames catalystdashboard module to developerdashboard

* Updates rbac-roles to include openshift project permissions

* Bumps version of cli-tools to 0.1.4 to pick up latest IBM Cloud terraform provider

* Updates argocd modules to latest version

* Installing postgress in cluster for ocp4

* add postgress to crc

* move postgresql into sonarqube

* Removes duplicated developerdashboard stage

* Updates module name within stage2-dashboard files

* Adds Swagger editor stages

* use default name for postgress dbname

* Changes argocd ref to point to ocp43-lite branch after merging argocd content in

* Updates module versions to v2.2.2

* Updates swagger module version to v2.2.3

* Updates version of postgres module to v2.2.4 for IKS and OCP 3 installs

* Bumpts tekton module version to v2.2.5

* Bumps pactbroker module version to v2.2.6

* Fixes version reference in postgres module

* Bumps Sonarqube module version to v2.2.7

* Bumps the Jenkins module to v2.2.8

* Bumps argocd module to v2.2.9 to fix IKS issue

* Bumps Jenkins module to v2.2.10 to fix IKS issue

* Bumps Dashboard module version to v2.2.11 so pact broker shows up

* Bumps logdna module to v2.2.12 to address issue on IKS

* Bumps sonarqube version to 2.2.13 to support inline postgres

* Bumps cluster version to v2.2.14 to fix issue cleaning up configmaps

* Adds Jenkins stage to ocp4 install

* Bumps IBM Cloud cluster module to v2.2.15 to fix timing issue on OCP4

Co-authored-by: Matthew Perrins <[email protected]>
Co-authored-by: Carlos Santana <[email protected]>

Author: 3 people

.gitignore

@@ -1,6 +1,6 @@
 .idea/
 *.iml
-credentials.properties
+credentials*.properties
 
 .bash_history
 .terraform.d/

Jenkinsfile

@@ -0,0 +1,126 @@
+/*
+ * This is a Jenkins pipeline that relies on the Jenkins kubernetes plugin to dynamically provision agents for
+ * the build containers.
+ *
+ * This pipeline expects three resources to be available in the namespace when it runs. See
+ * terraform/scripts/create-pipeline-resources.sh for more information
+ *
+ * The cloudName variable is set dynamically based on the existance/value of env.CLOUD_NAME which allows this pipeline
+ * to run in both Kubernetes and OpenShift environments.
+ */
+
+def buildAgentName(String jobNameWithNamespace, String buildNumber, String namespace) {
+    def jobName = removeNamespaceFromJobName(jobNameWithNamespace, namespace);
+
+    if (jobName.length() > 55) {
+        jobName = jobName.substring(0, 55);
+    }
+
+    return "a.${jobName}${buildNumber}".replaceAll('_', '-').replaceAll('/', '-').replaceAll('-.', '.');
+}
+
+def removeNamespaceFromJobName(String jobName, String namespace) {
+    return jobName.replaceAll(namespace + '-', '');
+}
+
+def toolsImage="ibmgaragecloud/cli-tools:0.1.1"
+
+def buildLabel = buildAgentName(env.JOB_NAME, env.BUILD_NUMBER, env.NAMESPACE);
+def namespace = env.NAMESPACE ?: "dev"
+def cloudName = env.CLOUD_NAME == "openshift" ? "openshift" : "kubernetes"
+def workingDir = "/home/jenkins/agent"
+podTemplate(
+   label: buildLabel,
+   cloud: cloudName,
+   yaml: """
+apiVersion: v1
+kind: Pod
+spec:
+  serviceAccountName: jenkins
+  volumes:
+    - name: terraform-tfvars
+      configMap:
+        name: terraform-tfvars
+  containers:
+    - name: setup-image
+      image: alpine:3.9.5
+      tty: true
+      command: ["/bin/sh"]
+      workingDir: ${workingDir}
+      env:
+        - name: HOME
+          value: ${workingDir}
+      volumeMounts:
+        - name: terraform-tfvars
+          mountPath: /etc/settings
+    - name: tools-image
+      image: ${toolsImage}
+      tty: true
+      command: ["/bin/bash"]
+      workingDir: ${workingDir}/terraform
+      env:
+        - name: HOME
+          value: ${workingDir}
+        - name: IBMCLOUD_API_KEY
+          valueFrom:
+            secretKeyRef:
+              name: terraform-credentials
+              key: "ibmcloud.api.key"
+        - name: TF_VAR_ibmcloud_api_key
+          valueFrom:
+            secretKeyRef:
+              name: terraform-credentials
+              key: "ibmcloud.api.key"
+        - name: IAAS_CLASSIC_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: terraform-credentials
+              key: "classic.username"
+        - name: IAAS_CLASSIC_API_KEY
+          valueFrom:
+            secretKeyRef:
+              name: terraform-credentials
+              key: "classic.api.key"
+"""
+) {
+    node(buildLabel) {
+        container(name: 'setup-image') {
+            checkout scm
+            stage('Copy settings') {
+                sh '''
+                    set +x
+
+                    cp -v /etc/settings/* ./terraform/settings
+
+                    echo "*** Terraform settings copied"
+                    echo ""
+                    echo "-- environment.tfvars --"
+                    cat ./terraform/settings/environment.tfvars
+                    echo ""
+                    echo "-- vlan.tfvars --"
+                    cat ./terraform/settings/vlan.tfvars
+                '''
+            }
+        }
+        container(name: 'tools-image', shell: '/bin/bash') {
+            stage('Provision cluster') {
+                sh '''
+                    set +x
+
+                    ./runTerraform.sh --force
+                '''
+            }
+            stage('Validate cluster') {
+                sh '''
+                    echo "Nothing to do, yet"
+                '''
+            }
+            stage('Destroy cluster') {
+                sh '''
+                    echo "Nothing to do, yet"
+                '''
+            }
+        }
+    }
+}
+

README.md

@@ -1,17 +1,17 @@
-# IBM Garage for Cloud & Solution Engineering
+# IBM Garage Solution Engineering
 ## Iteration Zero for IBM Cloud
 
-This repository contains infrastructure as code (IasC) scripting to create an IBM Garage for Cloud Developer Tools environment ready for cloud-native application development with IBM Cloud Kubernetes Service or Red Hat OpenShift on IBM Cloud. 
+This repository contains infrastructure as code (IasC) scripting to create an IBM Garage Clout Native Toolkit development  environment ready for cloud-native application development with IBM Cloud Kubernetes Service or Red Hat OpenShift. 
 
 ### Overview
 
-Iteration Zero creates an IBM Garage for Cloud Developer Tools environment in IBM Cloud, complete with tools and services needed for continuous delivery of typical cloud-native applications to a [IBM Cloud Kubernetes Service](https://cloud.ibm.com/docs/containers) or [Red Hat OpenShift on IBM Cloud](https://cloud.ibm.com/docs/openshift) cluster. Typically a squad lead or lead developer would create this environment after the initial inception workshop has completed and the development team is ready to write code.
+Iteration Zero creates an IBM Garage Cloud Native Toolkit environment in IBM Cloud, complete with tools and services needed for continious delivery of typical cloud-native applications to a [IBM Cloud Kubernetes Service](https://cloud.ibm.com/docs/containers) or [Red Hat OpenShift on IBM Cloud](https://cloud.ibm.com/docs/openshift) cluster. Typically a squad lead or lead developer would create this environment after the initial inception workshop has completed and the development team is ready to write code.
 
-The objective of this environment is to reduce the amount of time and effort a team needs to spend creating and configuring their Kubernetes or OpenShift development environments. Rather than the lead having to reinvent the wheel deciding how to set up a continious development environment and perform the manual effort to create, install, and configure the cluster, tools, and services, these infrastructure as code (IasC) scripts automate the process to consistently create an environment as needed that embodies these best practices. The scripts are modular so tools can be easily disabled or added. This combindation of tools are proven in the industry to deliver real value for modern cloud-native development. 
+The objective of this environment is to reduce the amount of time and effort a team needs to spend creating and configuring their Kubernetes or OpenShift development environments. Rather than the team having to reinvent the wheel deciding how to set up a continious development environment and perform the manual effort to create, install, and configure the cluster, tools, and services, these infrastructure as code (IasC) scripts automate the process to consistently create an environment as needed that embodies these best practices. The scripts are modular so tools can be easily disabled or added. This combindation of tools are proven in the industry to deliver real value for modern cloud-native development. 
 
 The Red Hat [Open Innovation Labs](https://github.com/rht-labs/labs-ci-cd) has a very similar approach to how they deliver success with OpenShift.
 
-You can jump straight to the [Developers Guide](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/) if you want more detail on how the Cloud Developer Tools environment fits into the end-to-end development story.
+You can jump straight to the [Developers Guide](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/) if you want more detail on how the Cloud Native Toolkit fits into the end-to-end development story.
 
 This repo contains Terraform resources that will create an environment containing the following development tools:
 - IBM Container Service cluster (3 nodes) for Kubernetes or OpenShift
@@ -22,7 +22,8 @@ This repo contains Terraform resources that will create an environment containin
     - [Argo CD](https://argoproj.github.io/argo-cd/)
     - [SonarQube](https://www.sonarqube.org/) 
     - [Pact Broker](https://docs.pact.io/)
-    - [Artefactory](https://jfrog.com/open-source/)
+    - [Artifactory](https://jfrog.com/open-source/)
+    - [Swagger Editor](https://editor.swagger.io/)
     - [Eclipse Che](https://www.eclipse.org/che/)
 -  Cloud services for cloud-native applications:
     - [AppID Application Authentication](https://cloud.ibm.com/docs/services/appid) 
@@ -34,22 +35,22 @@ This repo contains Terraform resources that will create an environment containin
 
 ## Developer Tools
 
-This diagram illustrates the components in a Cloud Developer Tools environment:
+This diagram illustrates the components in a Cloud Native Toolkit environment:
 
 ![Provisioned environment](./docs/images/catalyst-provisioned-environment.png)
 
 ## Developer Guide
 
-[Developer Guide](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/) explains how to use the Cloud Developer Tools environment.
+[Developer Guide](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/) explains how to use the Cloud Native Toolkit environment.
 Use it to deep dive into how to use these tools and programming models to make yourself productive with Kubernetes and OpenShift on the IBM Cloud.
 
-### Create the Cloud Developer Tools environment
+### Install and Configure
 
-Start with the [installation instructions](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/getting-started/overview) for creating the Cloud Developer Tools environment. It contains the instructions for how to setup and run the Terraform Infrastructure as Code scripts in this repo.
+Start with the [installation instructions](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/getting-started/overview) for creating the Cloud Native Toolkit environment. It contains the instructions for how to setup and run the Terraform Infrastructure as Code scripts in this repo.
 
-### Cloud Developer Tools Dashboard
+### Developer Dashboard
 
-[Cloud Developer Tools Dashboard](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/getting-started/dashboard/)
+[Developer Dashboard](https://ibm-garage-cloud.github.io/ibm-garage-developer-guide/getting-started/dashboard/)
 explains how to open the dashbard for using the Cloud Developer Tools environment.
 
 ### Destroying
@@ -59,7 +60,7 @@ The scripts that created the Cloud Developer Tools environment can also be used
 
 ## Summary
 
-We are working to make Kubernetes and OpenShift development as easy as possible, any feedback on the use of the project will be most welcome.
+We are working to make Kubernetes and OpenShift development as easy as possible this toolkit adds what feels like a PaaS layer to a Kubernetes environment, any feedback on the use of the project will be most welcome.
 
-Thanks IBM Garage for Cloud Team
+Thanks IBM Garage Solution Engineering
 

docs/images/catalyst-provisioned-environment.png

@@ -5,7 +5,7 @@
 SCRIPT_DIR="$(cd $(dirname $0); pwd -P)"
 SRC_DIR="$(cd "${SCRIPT_DIR}/terraform" ; pwd -P)"
 
-DOCKER_IMAGE="garagecatalyst/ibm-garage-cli-tools:0.0.24"
+DOCKER_IMAGE="ibmgaragecloud/cli-tools:0.1.4"
 
 helpFunction()
 {
@@ -40,7 +40,7 @@ helpFunction()
 ENV="credentials"
 
 function prop {
-    grep "${1}" ${ENV}.properties|cut -d'=' -f2
+    grep "${1}" ${ENV}.properties | cut -d'=' -f2
 }
 
 if [[ -f "${ENV}.properties" ]]; then
@@ -62,16 +62,18 @@ SUFFIX=$(echo $(basename ${SCRIPT_DIR}) | base64 | sed -E "s/[^a-zA-Z0-9_.-]//g"
 CONTAINER_NAME="ibm-garage-cli-tools-${SUFFIX}"
 
 echo "Cleaning up old container: ${CONTAINER_NAME}"
-docker kill ${CONTAINER_NAME} 1> /dev/null 2> /dev/null
-docker rm ${CONTAINER_NAME} 1> /dev/null 2> /dev/null
+
+DOCKER_CMD="docker"
+${DOCKER_CMD} kill ${CONTAINER_NAME} 1> /dev/null 2> /dev/null
+${DOCKER_CMD} rm ${CONTAINER_NAME} 1> /dev/null 2> /dev/null
 
 if [[ -n "$1" ]]; then
-    echo "Pulling docker image: ${DOCKER_IMAGE}"
-    docker pull "${DOCKER_IMAGE}"
+    echo "Pulling container image: ${DOCKER_IMAGE}"
+    ${DOCKER_CMD} pull "${DOCKER_IMAGE}"
 fi
 
 echo "Initializing container ${CONTAINER_NAME} from ${DOCKER_IMAGE}"
-docker run -itd --name ${CONTAINER_NAME} \
+${DOCKER_CMD} run -itd --name ${CONTAINER_NAME} \
    -v ${SRC_DIR}:/home/devops/src \
    -e TF_VAR_ibmcloud_api_key="${IBMCLOUD_API_KEY}" \
    -e IBMCLOUD_API_KEY="${IBMCLOUD_API_KEY}" \
@@ -81,4 +83,4 @@ docker run -itd --name ${CONTAINER_NAME} \
    ${DOCKER_IMAGE}
 
 echo "Attaching to running container..."
-docker attach ${CONTAINER_NAME}
+${DOCKER_CMD} attach ${CONTAINER_NAME}