Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[minor] Support October Catalog #1234

Merged
merged 46 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3e0bb4f
[patch] add catalog file and catalog docs file for october patch
anilprajapatiibm Sep 10, 2024
f37d52a
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 11, 2024
e5a20ff
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 11, 2024
5435007
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 12, 2024
74e2d39
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 12, 2024
407e387
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 12, 2024
6121868
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 12, 2024
5d181d6
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 12, 2024
74b2cef
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 13, 2024
62ab724
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 13, 2024
810ca68
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 18, 2024
e4d7aad
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 18, 2024
204e753
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 18, 2024
f98b3c7
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 18, 2024
33aa6f6
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 18, 2024
2768461
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 19, 2024
6d7bed4
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 19, 2024
6766962
[patch] solve table span
anilprajapatiibm Sep 19, 2024
1d085fb
[patch] add rowspan="5"
anilprajapatiibm Sep 19, 2024
6a0aeae
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 19, 2024
a28a8a5
[patch] update local ansible-devops tar.gz
anilprajapatiibm Sep 23, 2024
216eefc
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 23, 2024
e965e51
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 24, 2024
199e25f
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 25, 2024
85165fe
[patch] update docs
anilprajapatiibm Sep 25, 2024
dd77929
[patch] update/app/py add oct catalog
anilprajapatiibm Sep 25, 2024
5713f91
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 25, 2024
fa70141
[patch] add predict 9.0.1 and 8.9.5
anilprajapatiibm Sep 26, 2024
308f940
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 26, 2024
1fdfe73
[patch] update monitor and mvi
anilprajapatiibm Sep 26, 2024
9a0a4a7
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 26, 2024
8405474
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 27, 2024
57f5732
[patch] add iot and manage
anilprajapatiibm Sep 27, 2024
df74008
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 27, 2024
eecc12a
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 27, 2024
d8d7883
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 27, 2024
e612fbc
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Sep 30, 2024
2e8e18a
Merge branch 'master' into octobercatalog
anilprajapatiibm Sep 30, 2024
2af596a
[patch] add ibm-mas
anilprajapatiibm Oct 1, 2024
9a5ccac
move up to latest ansible-devops
IanBoden Oct 1, 2024
4963e5b
Merge branch 'master' into octobercatalog
anilprajapatiibm Oct 3, 2024
615c893
[patch] update local ansible-devops tar.gz
anilprajapatiibm Oct 3, 2024
8f82c6f
[patch] remove local ansible-devops and update docs catalog
anilprajapatiibm Oct 4, 2024
3b94fef
[patch] update local ansible-devops tar.gz & Catalog Digest
anilprajapatiibm Oct 4, 2024
89a3dfb
[patch] remove local ansible-devops tar
anilprajapatiibm Oct 4, 2024
29f8625
[patch] update catalog docs
anilprajapatiibm Oct 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/bin/build-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
find docs -type f -name '*.md' -exec sed -i \
-e 's/@@CLI_LATEST_VERSION@@/11.1.3/g' \
-e 's/@@MAS_PREVIOUS_CHANNEL@@/8.11.x/g' \
-e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240730-amd64/g' \
-e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240827-amd64/g' \
-e 's/@@MAS_LATEST_CHANNEL@@/9.0.x/g' \
-e 's/@@MAS_LATEST_CHANNEL_MANAGE@@/9.0.x/g' \
-e 's/@@MAS_LATEST_CATALOG@@/v9-240827-amd64/g' \
-e 's/@@MAS_LATEST_CATALOG@@/v9-241003-amd64/g' \
{} \;

python -m pip install -q mkdocs mkdocs-redirects
Expand Down
12 changes: 12 additions & 0 deletions catalogs/v9-241003-amd64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: ibm-operator-catalog
namespace: openshift-marketplace
spec:
displayName: IBM Maximo Operators (v9-241003-amd64)
publisher: IBM
description: Static Catalog Source for IBM Maximo Application Suite
sourceType: grpc
image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:ba2237481b2ce7407698775a71f44daaecd2db6f74855f20829ac1bceeddb3d9
priority: 90
1 change: 1 addition & 0 deletions docs/catalogs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ To receive security updates and bug fixes you must periodically update the versi
#### 2024
| Catalog | OCP Support | Recommended CLI | End of Support |
| ------------------------------------- | ----------- | --------------- | ------------------------------- |
| [v9-241003-amd64](v9-241003-amd64.md) | 4.12 - 4.15 | latest | OCP 4.14 EOS October 31, 2025 |
| [v9-240827-amd64](v9-240827-amd64.md) | 4.12 - 4.15 | latest | OCP 4.14 EOS October 31, 2025 |
| [v9-240730-amd64](v9-240730-amd64.md) | 4.12 - 4.15 | latest | OCP 4.14 EOS October 31, 2025 |
| [v9-240625-amd64](v9-240625-amd64.md) | 4.12 - 4.14 | latest | OCP 4.14 EOS October 31, 2025 |
Expand Down
682 changes: 682 additions & 0 deletions docs/catalogs/v9-241003-amd64.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ nav:
- "configtool-oidc": commands/configtool-oidc.md
- "Operator Catalogs":
- "All Catalogs": catalogs/index.md
- "Oct 03 2024": catalogs/v9-241003-amd64.md
- "Aug 27 2024": catalogs/v9-240827-amd64.md
- "Jul 30 2024": catalogs/v9-240730-amd64.md
- "Jun 25 2024": catalogs/v9-240625-amd64.md
- "May 28 2024": catalogs/v8-240528-amd64.md
- "Reference":
- "Dependencies": reference/dependencies.md
- "Topology": reference/topology.md
Expand Down
90 changes: 45 additions & 45 deletions python/src/mas/cli/install/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def configSpecialCharacters(self):
self.yesOrNo("Do you want to allow special characters for user IDs and usernames?", "mas_special_characters")

def configCP4D(self):
if self.getParam("mas_catalog_version") in ["v9-240625-amd64", "v9-240730-amd64", "v9-240827-amd64"]:
if self.getParam("mas_catalog_version") in ["v9-240625-amd64", "v9-240730-amd64", "v9-240827-amd64", "v9-241003-amd64"]:
logger.debug(f"Using automatic CP4D product version: {self.getParam('cpd_product_version')}")
self.setParam("cpd_product_version", "4.8.0")
elif self.getParam("cpd_product_version") == "":
Expand Down Expand Up @@ -929,6 +929,45 @@ def install(self, argv):
self.installOptions = [
{
"#": 1,
"catalog": "v9-241003-amd64",
"release": "9.0.x",
"core": "9.0.3",
"assist": "9.0.2",
"iot": "9.0.3",
"manage": "9.0.3",
"monitor": "9.0.3",
"optimizer": "9.0.3",
"predict": "9.0.2",
"inspection": "9.0.3"
},
{
"#": 2,
"catalog": "v9-241003-amd64",
"release": "8.11.x",
"core": "8.11.15",
"assist": "8.8.6",
"iot": "8.8.13",
"manage": "8.7.12",
"monitor": "8.11.11",
"optimizer": "8.5.9",
"predict": "8.9.5",
"inspection": "8.9.6"
},
{
"#": 3,
"catalog": "v9-241003-amd64",
"release": "8.10.x",
"core": "8.10.18",
"assist": "8.7.7",
"iot": "8.7.17",
"manage": "8.6.18",
"monitor": "8.10.14",
"optimizer": "8.4.10",
"predict": "8.8.3",
"inspection": "8.8.4"
},
{
"#": 4,
"catalog": "v9-240827-amd64",
"release": "9.0.x",
"core": "9.0.2",
Expand All @@ -941,7 +980,7 @@ def install(self, argv):
"inspection": "9.0.2"
},
{
"#": 2,
"#": 5,
"catalog": "v9-240827-amd64",
"release": "8.11.x",
"core": "8.11.14",
Expand All @@ -954,7 +993,7 @@ def install(self, argv):
"inspection": "8.9.5"
},
{
"#": 3,
"#": 6,
"catalog": "v9-240827-amd64",
"release": "8.10.x",
"core": "8.10.17",
Expand All @@ -967,7 +1006,7 @@ def install(self, argv):
"inspection": "8.8.4"
},
{
"#": 4,
"#": 7,
"catalog": "v9-240730-amd64",
"release": "9.0.x",
"core": "9.0.1",
Expand All @@ -980,7 +1019,7 @@ def install(self, argv):
"inspection": "9.0.0"
},
{
"#": 5,
"#": 8,
"catalog": "v9-240730-amd64",
"release": "8.11.x",
"core": "8.11.13",
Expand All @@ -993,7 +1032,7 @@ def install(self, argv):
"inspection": "8.9.4"
},
{
"#": 6,
"#": 9,
"catalog": "v9-240730-amd64",
"release": "8.10.x",
"core": "8.10.16",
Expand All @@ -1004,45 +1043,6 @@ def install(self, argv):
"optimizer": "8.4.8",
"predict": "8.8.3",
"inspection": "8.8.4"
},
{
"#": 7,
"catalog": "v9-240625-amd64",
"release": "9.0.x",
"core": "9.0.0",
"assist": "9.0.0",
"iot": "9.0.0",
"manage": "9.0.0",
"monitor": "9.0.0",
"optimizer": "9.0.0",
"predict": "9.0.0",
"inspection": "9.0.0"
},
{
"#": 8,
"catalog": "v9-240625-amd64",
"release": "8.11.x",
"core": "8.11.12",
"assist": "N/A",
"iot": "8.8.10",
"manage": "8.7.9",
"monitor": "8.11.8",
"optimizer": "8.5.6",
"predict": "8.9.3",
"inspection": "8.9.3"
},
{
"#": 9,
"catalog": "v9-240625-amd64",
"release": "8.10.x",
"core": "8.10.15",
"assist": "N/A",
"iot": "8.7.14",
"manage": "8.6.15",
"monitor": "8.10.11",
"optimizer": "8.4.7",
"predict": "N/A",
"inspection": "8.8.4"
}
]

Expand Down
15 changes: 9 additions & 6 deletions python/src/mas/cli/update/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,13 @@ def chooseCatalog(self) -> None:
self.printH1("Select IBM Maximo Operator Catalog Version")
self.printDescription([
"Select MAS Catalog",
" 1) Aug 27 2024 Update (MAS 9.0.2, 8.11.14, & 8.10.17)",
" 2) July 30 2024 Update (MAS 9.0.1, 8.11.13, & 8.10.16)",
" 3) June 25 2024 Update (MAS 9.0.0, 8.11.12, & 8.10.15)"
" 1) Oct 03 2024 Update (MAS 9.0.3, 8.11.15, & 8.10.18)",
" 2) Aug 27 2024 Update (MAS 9.0.2, 8.11.14, & 8.10.17)",
" 3) July 30 2024 Update (MAS 9.0.1, 8.11.13, & 8.10.16)"
])

catalogOptions = [
"v9-240827-amd64", "v9-240730-amd64", "v9-240625-amd64"
"v9-241003-amd64", "v9-240827-amd64", "v9-240730-amd64"
]
self.promptForListSelect("Select catalog version", catalogOptions, "mas_catalog_version", default=1)

Expand Down Expand Up @@ -345,7 +345,8 @@ def detectMongoDb(self) -> None:
mongoVersions = {
"v9-240625-amd64": "6.0.12",
"v9-240730-amd64": "6.0.12",
"v9-240827-amd64": "6.0.12"
"v9-240827-amd64": "6.0.12",
"v9-241003-amd64": "6.0.12"
}
catalogVersion = self.getParam('mas_catalog_version')
if catalogVersion in mongoVersions:
Expand Down Expand Up @@ -467,7 +468,9 @@ def detectCP4D(self) -> bool:
cp4dVersions = {
"v9-240625-amd64": "4.8.0",
"v9-240730-amd64": "4.8.0",
"v9-240827-amd64": "4.8.0"
"v9-240827-amd64": "4.8.0",
"v9-241003-amd64": "4.8.0"

}

with Halo(text='Checking for IBM Cloud Pak for Data', spinner=self.spinner) as h:
Expand Down