Skip to content

Commit

Permalink
feat: Upgrade CP4D to 4.8
Browse files Browse the repository at this point in the history
Signed-off-by: Denilson Nastacio <[email protected]>
  • Loading branch information
nastacio committed Nov 29, 2023
1 parent 88e5266 commit 6a4db7d
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 38 deletions.
33 changes: 13 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
# IBM Cloud Paks - GitOps Demo

## Contents
<!-- TOC -->

- [IBM Cloud Paks - GitOps Demo](#ibm-cloud-paks---gitops-demo)
- [Contents](#contents)
- [Overview](#overview)
- [IBM Cloud Paks](#ibm-cloud-paks)
- [Shared cluster](#shared-cluster)
- [GitOps](#gitops)
- [Governance Policies](#governance-policies)
- [Storage](#storage)
- [Installation](#installation)
- [Individual clusters](#individual-clusters)
- [Fleet of clusters with governance](#fleet-of-clusters-with-governance)
- [Contributing](#contributing)

---

## Overview

This repository contains Argo CD `Application` resources representing sample deployments of IBM Cloud Paks, and, as such, they are meant for inclusion in an Argo CD cluster. Different Cloud Paks are represented with different `Application` resources and grouped by a resource label tied to each Cloud Pak.
- [IBM Cloud Paks](#ibm-cloud-paks)
- [Shared cluster](#shared-cluster)
- [GitOps](#gitops)
- [Governance Policies](#governance-policies)
- [Storage](#storage)
- [Installation](#installation)
- [Individual clusters](#individual-clusters)
- [Fleet of clusters with governance](#fleet-of-clusters-with-governance)
- [Contributing](#contributing)

<!-- /TOC -->ry contains Argo CD `Application` resources representing sample deployments of IBM Cloud Paks, and, as such, they are meant for inclusion in an Argo CD cluster. Different Cloud Paks are represented with different `Application` resources and grouped by a resource label tied to each Cloud Pak.

**Important**: This repository is meant as a demonstration of how Cloud Pak deployments can be deployed and managed with GitOps practices. Adoption in a production environment can start from a repository fork, followed by customization of folders and files to match the desired configuration.

Expand All @@ -36,7 +29,7 @@ Supported versions:
| Cloud Pak | Version | Installation mode |
| ----------|---------|-------------------|
| Cloud Pak for Business Automation | [23.0.1](https://www.ibm.com/docs/en/cloud-paks/cp-biz-automation/23.0.1) | Multi-pattern starter deployment |
| Cloud Pak for Data | [4.7.2](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=overview) | Online, specialized installation |
| Cloud Pak for Data | [4.8.0](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=overview) | Online, specialized installation |
| Cloud Pak for Integration | [2023.2](https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.2) | Online installation |
| Cloud Pak for Security | [1.10.15](https://www.ibm.com/docs/en/cloud-paks/cp-security/1.10) | Online installation |
| Cloud Pak for AIOps\* | [4.2.1](https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.2.1) | Starter Installation |
Expand Down
4 changes: 2 additions & 2 deletions config/argocd-cloudpaks/cp4d/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
operators_namespace: cp4d
operands_namespace: cp4d-operands

# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-determining-which-components-install
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=information-determining-which-components-install
components: ibm-cert-manager,ibm-licensing,cpfs,cpd_platform,rstudio,wml,ws

storageclass:
Expand All @@ -20,4 +20,4 @@ iam_integration: true

image_arch: amd64

version: 4.7.2
version: 4.8.0
4 changes: 2 additions & 2 deletions config/cloudpaks/cp4d/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.1
version: 0.8.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 4.7.2
appVersion: 4.8.0
7 changes: 3 additions & 4 deletions config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-setting-up-installation-environment-variables
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=information-setting-up-installation-environment-variables
apiVersion: batch/v1
kind: Job
metadata:
Expand All @@ -13,7 +13,6 @@ spec:
spec:
containers:
- name: configure-cluster
# Image associated with CPD CLI v13.0.1 @ https://github.com/IBM/cpd-cli/releases/tag/v13.0.1
image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}"
env:
- name: PROJECT_CERT_MANAGER
Expand All @@ -37,7 +36,7 @@ spec:
result=0
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=cluster-installing-shared-components
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=cluster-installing-shared-components
bin/apply-cluster-components \
--release=${VERSION:?} \
--license_acceptance=true \
Expand Down Expand Up @@ -94,7 +93,7 @@ spec:
hypershift_deployment=$(oc get Infrastructure cluster \
-o jsonpath='{.metadata.labels.hypershift\.openshift\.io/managed}')
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=settings-changing-cri-o-container
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=settings-changing-cri-o-container
crio="none"
if [ -n "${hypershift_deployment}" ]; then
crio="none"
Expand Down
8 changes: 4 additions & 4 deletions config/cloudpaks/cp4d/templates/0100-sync-install-olm.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=installing
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=installing
apiVersion: batch/v1
kind: Job
metadata:
Expand Down Expand Up @@ -35,7 +35,7 @@ spec:
result=0
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=services-creating-informix-scc
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=services-creating-informix-scc
echo "INFO: Creating custom security context constraints for services."
if [[ ${COMPONENTS} =~ informix ]]; then
bin/apply-scc \
Expand All @@ -47,7 +47,7 @@ spec:
}
fi
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=data-installing-cloud-pak-foundational-services
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=data-installing-cloud-pak-foundational-services
echo "INFO: Installing foundational services" \
&& bin/authorize-instance-topology \
--cpd_operator_ns=${PROJECT_CPD_INST_OPERATORS:?} \
Expand All @@ -67,7 +67,7 @@ spec:
--cpd_operator_ns=${PROJECT_CPD_INST_OPERATORS} \
|| result=1
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=data-specifying-privileges-that-db2u-runs
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=data-specifying-privileges-that-db2u-runs
oc apply -f - <<EOF
apiVersion: v1
data:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=installing
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=installing
apiVersion: batch/v1
kind: Job
metadata:
Expand Down Expand Up @@ -35,7 +35,7 @@ spec:
result=0
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=data-installing-cloud-pak
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=data-installing-cloud-pak
echo "INFO: Installing components in a specialized installation." \
&& bin/apply-cr \
--components=${COMPONENTS:?} \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=environment-customizing-securing-route-platform
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=environment-customizing-securing-route-platform
apiVersion: batch/v1
kind: Job
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=manage-setup-iam-integration
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=manage-setup-iam-integration
apiVersion: batch/v1
kind: Job
metadata:
Expand Down
1 change: 0 additions & 1 deletion config/cloudpaks/cp4d/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ metadata:
operators_namespace: cp4d
operands_namespace: cp4d

# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-determining-which-components-install
components: "set in parent app"

storageclass:
Expand Down
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ This repository allows some light customizations to enable its reuse for demonst
#### Cloud Pak for Data
The main Argo Application for the Cloud Pak (`config/argocd-cloudpaks/cp4d`) has a parameter named `components`, which contains a comma-separated list of components names matching the values in the [product documentation](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-determining-which-components-install).
The main Argo Application for the Cloud Pak (`config/argocd-cloudpaks/cp4d`) has a parameter named `components`, which contains a comma-separated list of components names matching the values in the [product documentation](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=information-determining-which-components-install).
Alter the values in this array with the element names found in the product documentation (e.g., `wml` for Watson Machine Learning) to define the list of components installed in the target cluster.
Expand Down

0 comments on commit 6a4db7d

Please sign in to comment.