mas-cli 14.1.0__py3-none-any.whl → 15.1.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of mas-cli might be problematic. Click here for more details.
- mas/cli/__init__.py +1 -1
- mas/cli/aiservice/install/app.py +209 -133
- mas/cli/aiservice/install/argBuilder.py +54 -120
- mas/cli/aiservice/install/argParser.py +138 -373
- mas/cli/aiservice/install/params.py +30 -50
- mas/cli/aiservice/install/summarizer.py +48 -106
- mas/cli/cli.py +1 -1
- mas/cli/install/app.py +1 -1
- mas/cli/install/catalogs.py +3 -2
- mas/cli/install/params.py +0 -23
- mas/cli/templates/ibm-mas-tekton.yaml +8748 -11094
- mas/cli/update/app.py +7 -4
- {mas_cli-14.1.0.dist-info → mas_cli-15.1.0.dist-info}/METADATA +1 -1
- {mas_cli-14.1.0.dist-info → mas_cli-15.1.0.dist-info}/RECORD +17 -17
- {mas_cli-14.1.0.data → mas_cli-15.1.0.data}/scripts/mas-cli +0 -0
- {mas_cli-14.1.0.dist-info → mas_cli-15.1.0.dist-info}/WHEEL +0 -0
- {mas_cli-14.1.0.dist-info → mas_cli-15.1.0.dist-info}/top_level.txt +0 -0
|
@@ -58,63 +58,43 @@ optionalParams = [
|
|
|
58
58
|
"artifactory_username",
|
|
59
59
|
"artifactory_token",
|
|
60
60
|
# Aibroker
|
|
61
|
-
"
|
|
62
|
-
"
|
|
63
|
-
"
|
|
64
|
-
"
|
|
65
|
-
"
|
|
66
|
-
"
|
|
67
|
-
"
|
|
68
|
-
"
|
|
69
|
-
"
|
|
70
|
-
"
|
|
71
|
-
|
|
72
|
-
"
|
|
73
|
-
"
|
|
74
|
-
"
|
|
75
|
-
"
|
|
76
|
-
|
|
77
|
-
"
|
|
78
|
-
|
|
79
|
-
"mas_aibroker_db_database",
|
|
80
|
-
"mas_aibroker_db_secret_name",
|
|
81
|
-
"mas_aibroker_db_secret_key",
|
|
82
|
-
"mas_aibroker_db_secret_value",
|
|
83
|
-
"aibroker_instance_id",
|
|
84
|
-
"mariadb_user",
|
|
85
|
-
"mariadb_password",
|
|
61
|
+
"aiservice_storage_provider",
|
|
62
|
+
"aiservice_storage_accesskey",
|
|
63
|
+
"aiservice_storage_secretkey",
|
|
64
|
+
"aiservice_storage_host",
|
|
65
|
+
"aiservice_storage_port",
|
|
66
|
+
"aiservice_storage_ssl",
|
|
67
|
+
"aiservice_storage_region",
|
|
68
|
+
"aiservice_storage_pipelines_bucket",
|
|
69
|
+
"aiservice_storage_tenants_bucket",
|
|
70
|
+
"aiservice_storage_templates_bucket",
|
|
71
|
+
|
|
72
|
+
"aiservice_watsonxai_apikey",
|
|
73
|
+
"aiservice_watsonxai_url",
|
|
74
|
+
"aiservice_watsonxai_project_id",
|
|
75
|
+
"aiservice_watsonx_action",
|
|
76
|
+
|
|
77
|
+
"aiservice_instance_id",
|
|
78
|
+
|
|
86
79
|
"minio_root_user",
|
|
87
80
|
"minio_root_password",
|
|
81
|
+
|
|
88
82
|
"tenant_entitlement_type",
|
|
89
83
|
"tenant_entitlement_start_date",
|
|
90
84
|
"tenant_entitlement_end_date",
|
|
91
|
-
|
|
92
|
-
"
|
|
93
|
-
"
|
|
94
|
-
"
|
|
95
|
-
"
|
|
96
|
-
"
|
|
97
|
-
"
|
|
98
|
-
"
|
|
85
|
+
|
|
86
|
+
"aiservice_s3_bucket_prefix",
|
|
87
|
+
"aiservice_s3_region",
|
|
88
|
+
"aiservice_s3_endpoint_url",
|
|
89
|
+
"aiservice_tenant_s3_bucket_prefix",
|
|
90
|
+
"aiservice_tenant_s3_region",
|
|
91
|
+
"aiservice_tenant_s3_endpoint_url",
|
|
92
|
+
"aiservice_tenant_s3_access_key",
|
|
93
|
+
"aiservice_tenant_s3_secret_key",
|
|
94
|
+
|
|
99
95
|
"rsl_url",
|
|
100
96
|
"rsl_org_id",
|
|
101
97
|
"rsl_token",
|
|
102
|
-
|
|
103
|
-
"install_sls_aiservice",
|
|
104
|
-
"install_dro_aiservice",
|
|
105
|
-
"install_db2_aiservice",
|
|
106
|
-
"mas_aibroker_dro_secret_name",
|
|
107
|
-
"mas_aibroker_dro_api_key",
|
|
108
|
-
"mas_aibroker_dro_url",
|
|
109
|
-
"mas_aibroker_dro_ca_cert",
|
|
110
|
-
"mas_aibroker_db2_username",
|
|
111
|
-
"mas_aibroker_db2_password",
|
|
112
|
-
"mas_aibroker_db2_jdbc_url",
|
|
113
|
-
"mas_aibroker_db2_ssl_enabled",
|
|
114
|
-
"mas_aibroker_db2_ca_cert",
|
|
115
|
-
"mas_aibroker_sls_secret_name",
|
|
116
|
-
"mas_aibroker_sls_registration_key",
|
|
117
|
-
"mas_aibroker_sls_url",
|
|
118
|
-
"mas_aibroker_sls_ca_cert",
|
|
98
|
+
|
|
119
99
|
"environment_type",
|
|
120
100
|
]
|
|
@@ -10,7 +10,6 @@
|
|
|
10
10
|
|
|
11
11
|
import logging
|
|
12
12
|
import yaml
|
|
13
|
-
from prompt_toolkit import print_formatted_text, HTML
|
|
14
13
|
from mas.devops.ocp import getConsoleURL
|
|
15
14
|
|
|
16
15
|
logger = logging.getLogger(__name__)
|
|
@@ -32,116 +31,61 @@ class aiServiceInstallSummarizerMixin():
|
|
|
32
31
|
self.printParamSummary("Certificate Manager", "cert_manager_provider")
|
|
33
32
|
self.printParamSummary("Cluster Ingress Certificate Secret", "ocp_ingress_tls_secret_name")
|
|
34
33
|
|
|
35
|
-
def
|
|
36
|
-
|
|
37
|
-
self.printH2("IBM Maximo Application Suite")
|
|
38
|
-
|
|
39
|
-
print()
|
|
34
|
+
def aiServiceSummary(self) -> None:
|
|
35
|
+
self.printH2("Maximo Operator Catalog")
|
|
40
36
|
self.printParamSummary("Catalog Version", "mas_catalog_version")
|
|
41
37
|
# We only list the digest if it's specified (primary use case is when running development builds in airgap environments)
|
|
42
38
|
if self.getParam("mas_catalog_digest" != ""):
|
|
43
39
|
self.printParamSummary("Catalog Digest", "mas_catalog_digest")
|
|
44
|
-
self.printParamSummary("Subscription Channel", "mas_channel")
|
|
45
40
|
|
|
46
|
-
|
|
41
|
+
self.printH2("IBM Container Registry")
|
|
47
42
|
self.printParamSummary("IBM Entitled Registry", "mas_icr_cp")
|
|
48
43
|
self.printParamSummary("IBM Open Registry", "mas_icr_cpopen")
|
|
49
44
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
self.printSummary("Additional Config", "Not Configured")
|
|
55
|
-
|
|
56
|
-
def aibrokerSummary(self) -> None:
|
|
57
|
-
if self.installAiBroker:
|
|
58
|
-
self.printSummary("AI Broker", self.params["mas_app_channel_aibroker"])
|
|
59
|
-
print_formatted_text(HTML(" <SkyBlue>+ Maximo AI Broker Settings</SkyBlue>"))
|
|
60
|
-
self.printParamSummary(" + Aibroker Instance Id", "aibroker_instance_id")
|
|
61
|
-
self.printParamSummary(" + Storage provider", "mas_aibroker_storage_provider")
|
|
62
|
-
if self.getParam("mas_aibroker_storage_provider") == "minio":
|
|
63
|
-
self.printParamSummary(" + minio root username", "minio_root_user")
|
|
64
|
-
if self.getParam("mas_app_channel_aibroker") != "9.0.x":
|
|
65
|
-
self.printParamSummary(" + Mariadb username", "mariadb_user")
|
|
66
|
-
self.printParamSummary(" + Mariadb password", "mariadb_password")
|
|
67
|
-
self.printParamSummary(" + Storage access key", "mas_aibroker_storage_accesskey")
|
|
68
|
-
self.printParamSummary(" + Storage host", "mas_aibroker_storage_host")
|
|
69
|
-
self.printParamSummary(" + Storage port", "mas_aibroker_storage_port")
|
|
70
|
-
self.printParamSummary(" + Storage ssl", "mas_aibroker_storage_ssl")
|
|
71
|
-
self.printParamSummary(" + Storage region", "mas_aibroker_storage_region")
|
|
72
|
-
self.printParamSummary(" + Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
|
|
73
|
-
self.printParamSummary(" + Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
|
|
74
|
-
self.printParamSummary(" + Storage templates bucket", "mas_aibroker_storage_templates_bucket")
|
|
75
|
-
self.printParamSummary(" + Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
|
|
76
|
-
self.printParamSummary(" + Watsonxai project id", "mas_aibroker_watsonxai_project_id")
|
|
77
|
-
self.printParamSummary(" + Database host", "mas_aibroker_db_host")
|
|
78
|
-
self.printParamSummary(" + Database port", "mas_aibroker_db_port")
|
|
79
|
-
self.printParamSummary(" + Database user", "mas_aibroker_db_user")
|
|
80
|
-
self.printParamSummary(" + Database name", "mas_aibroker_db_database")
|
|
81
|
-
if self.getParam("mas_app_channel_aibroker") != "9.0.x":
|
|
82
|
-
self.printParamSummary(" + Tenant entitlement type", "tenant_entitlement_type")
|
|
83
|
-
self.printParamSummary(" + Tenant start date", "tenant_entitlement_start_date")
|
|
84
|
-
self.printParamSummary(" + Tenant end date", "tenant_entitlement_end_date")
|
|
85
|
-
self.printParamSummary(" + S3 bucket prefix", "mas_aibroker_s3_bucket_prefix")
|
|
86
|
-
self.printParamSummary(" + S3 endpoint url", "mas_aibroker_s3_endpoint_url")
|
|
87
|
-
self.printParamSummary(" + S3 bucket prefix (tenant level)", "mas_aibroker_tenant_s3_bucket_prefix")
|
|
88
|
-
self.printParamSummary(" + S3 region (tenant level)", "mas_aibroker_tenant_s3_region")
|
|
89
|
-
self.printParamSummary(" + S3 endpoint url (tenant level)", "mas_aibroker_tenant_s3_endpoint_url")
|
|
90
|
-
self.printParamSummary(" + RSL url", "rsl_url")
|
|
91
|
-
self.printParamSummary(" + ORG Id of RSL", "rsl_org_id")
|
|
92
|
-
self.printParamSummary(" + Token for RSL", "rsl_token")
|
|
93
|
-
self.printParamSummary(" + Install minio", "install_minio_aiservice")
|
|
94
|
-
self.printParamSummary(" + Install SLS", "install_sls_aiservice")
|
|
95
|
-
if self.getParam("install_sls_aiservice") != "true":
|
|
96
|
-
self.printParamSummary(" + SLS secret name", "mas_aibroker_sls_secret_name")
|
|
97
|
-
self.printParamSummary(" + SLS registration key", "mas_aibroker_sls_registration_key")
|
|
98
|
-
self.printParamSummary(" + SLS URL", "mas_aibroker_sls_url")
|
|
99
|
-
self.printParamSummary(" + Install DRO", "install_dro_aiservice")
|
|
100
|
-
if self.getParam("install_dro_aiservice") != "true":
|
|
101
|
-
self.printParamSummary(" + DRO secret name", "mas_aibroker_dro_secret_name")
|
|
102
|
-
self.printParamSummary(" + DRO API key", "mas_aibroker_dro_api_key")
|
|
103
|
-
self.printParamSummary(" + DRO URL", "mas_aibroker_dro_url")
|
|
104
|
-
self.printParamSummary(" + Install DB2", "install_db2_aiservice")
|
|
105
|
-
if self.getParam("install_db2_aiservice") != "true":
|
|
106
|
-
self.printParamSummary(" + DB2 username", "mas_aibroker_db2_username")
|
|
107
|
-
self.printParamSummary(" + DB2 JDBC URL", "mas_aibroker_db2_jdbc_url")
|
|
108
|
-
self.printParamSummary(" + DB2 SSL enabled", "mas_aibroker_db2_ssl_enabled")
|
|
109
|
-
self.printParamSummary(" + Environment type", "environment_type")
|
|
45
|
+
self.printH2("AI Service")
|
|
46
|
+
self.printParamSummary("Release", "aiservice_channel")
|
|
47
|
+
self.printParamSummary("Instance ID", "aiservice_instance_id")
|
|
48
|
+
self.printParamSummary("Environment type", "environment_type")
|
|
110
49
|
|
|
111
|
-
|
|
112
|
-
|
|
50
|
+
self.printH2("S3 Configuration")
|
|
51
|
+
self.printParamSummary("Storage provider", "aiservice_storage_provider")
|
|
52
|
+
if self.getParam("aiservice_storage_provider") == "minio":
|
|
53
|
+
self.printParamSummary("minio root username", "minio_root_user")
|
|
54
|
+
print()
|
|
55
|
+
self.printParamSummary("Storage access key", "aiservice_storage_accesskey")
|
|
56
|
+
self.printParamSummary("Storage host", "aiservice_storage_host")
|
|
57
|
+
self.printParamSummary("Storage port", "aiservice_storage_port")
|
|
58
|
+
self.printParamSummary("Storage ssl", "aiservice_storage_ssl")
|
|
59
|
+
self.printParamSummary("Storage region", "aiservice_storage_region")
|
|
60
|
+
self.printParamSummary("Storage pipelines bucket", "aiservice_storage_pipelines_bucket")
|
|
61
|
+
self.printParamSummary("Storage tenants bucket", "aiservice_storage_tenants_bucket")
|
|
62
|
+
self.printParamSummary("Storage templates bucket", "aiservice_storage_templates_bucket")
|
|
63
|
+
print()
|
|
64
|
+
self.printParamSummary("S3 bucket prefix", "aiservice_s3_bucket_prefix")
|
|
65
|
+
self.printParamSummary("S3 endpoint url", "aiservice_s3_endpoint_url")
|
|
66
|
+
self.printParamSummary("S3 bucket prefix (tenant level)", "aiservice_tenant_s3_bucket_prefix")
|
|
67
|
+
self.printParamSummary("S3 region (tenant level)", "aiservice_tenant_s3_region")
|
|
68
|
+
self.printParamSummary("S3 endpoint url (tenant level)", "aiservice_tenant_s3_endpoint_url")
|
|
69
|
+
|
|
70
|
+
self.printH2("IBM WatsonX")
|
|
71
|
+
self.printParamSummary("Watsonxai machine learning url", "aiservice_watsonxai_url")
|
|
72
|
+
self.printParamSummary("Watsonxai project id", "aiservice_watsonxai_project_id")
|
|
73
|
+
|
|
74
|
+
self.printH2("AI Service Tenant")
|
|
75
|
+
self.printParamSummary("Tenant entitlement type", "tenant_entitlement_type")
|
|
76
|
+
self.printParamSummary("Tenant start date", "tenant_entitlement_start_date")
|
|
77
|
+
self.printParamSummary("Tenant end date", "tenant_entitlement_end_date")
|
|
78
|
+
|
|
79
|
+
self.printH2("RSL")
|
|
80
|
+
self.printParamSummary("RSL url", "rsl_url")
|
|
81
|
+
self.printParamSummary("ORG Id of RSL", "rsl_org_id")
|
|
82
|
+
self.printParamSummary("Token for RSL", "rsl_token")
|
|
113
83
|
|
|
114
84
|
def db2Summary(self) -> None:
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
self.printParamSummary(" - Type", "db2_type")
|
|
120
|
-
self.printParamSummary(" - Timezone", "db2_timezone")
|
|
121
|
-
print()
|
|
122
|
-
self.printParamSummary("Install Namespace", "db2_namespace")
|
|
123
|
-
self.printParamSummary("Subscription Channel", "db2_channel")
|
|
124
|
-
print()
|
|
125
|
-
self.printParamSummary("CPU Request", "db2_cpu_requests")
|
|
126
|
-
self.printParamSummary("CPU Limit", "db2_cpu_limits")
|
|
127
|
-
self.printParamSummary("Memory Request", "db2_memory_requests")
|
|
128
|
-
self.printParamSummary("Memory Limit ", "db2_memory_limits")
|
|
129
|
-
print()
|
|
130
|
-
self.printParamSummary("Meta Storage", "db2_meta_storage_size")
|
|
131
|
-
self.printParamSummary("Data Storage", "db2_data_storage_size")
|
|
132
|
-
self.printParamSummary("Backup Storage", "db2_backup_storage_size")
|
|
133
|
-
self.printParamSummary("Temp Storage", "db2_temp_storage_size")
|
|
134
|
-
self.printParamSummary("Transaction Logs Storage", "db2_logs_storage_size")
|
|
135
|
-
print()
|
|
136
|
-
if self.getParam('db2_affinity_key') != "":
|
|
137
|
-
self.printSummary("Node Affinity", f"{self.getParam('db2_affinity_key')}={self.getParam('db2_affinity_value')}")
|
|
138
|
-
else:
|
|
139
|
-
self.printSummary("Node Affinity", "None")
|
|
140
|
-
|
|
141
|
-
if self.getParam('db2_tolerate_key') != "":
|
|
142
|
-
self.printSummary("Node Tolerations", f"{self.getParam('db2_tolerate_key')}={self.getParam('db2_tolerate_value')} @ {self.getParam('db2_tolerate_effect')}")
|
|
143
|
-
else:
|
|
144
|
-
self.printSummary("Node Tolerations", "None")
|
|
85
|
+
self.printH2("IBM Db2 Univeral Operator Configuration")
|
|
86
|
+
self.printParamSummary("Action", "db2_action_aiservice")
|
|
87
|
+
self.printParamSummary("Install Namespace", "db2_namespace")
|
|
88
|
+
self.printParamSummary("Subscription Channel", "db2_channel")
|
|
145
89
|
|
|
146
90
|
def droSummary(self) -> None:
|
|
147
91
|
self.printH2("IBM Data Reporter Operator (DRO) Configuration")
|
|
@@ -179,14 +123,12 @@ class aiServiceInstallSummarizerMixin():
|
|
|
179
123
|
logger.debug("PipelineRun parameters:")
|
|
180
124
|
logger.debug(yaml.dump(self.params, default_flow_style=False))
|
|
181
125
|
|
|
182
|
-
# Cluster Config &
|
|
126
|
+
# Cluster Config & AI Service
|
|
183
127
|
self.ocpSummary()
|
|
128
|
+
self.aiServiceSummary()
|
|
129
|
+
|
|
130
|
+
# Dependencies
|
|
184
131
|
self.droSummary()
|
|
185
132
|
self.slsSummary()
|
|
186
|
-
self.masSummary()
|
|
187
|
-
self.printH2("IBM Maximo Application Suite Application - Aiservice")
|
|
188
|
-
self.aibrokerSummary()
|
|
189
|
-
|
|
190
|
-
# Application Dependencies
|
|
191
133
|
self.mongoSummary()
|
|
192
134
|
self.db2Summary()
|
mas/cli/cli.py
CHANGED
|
@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
|
|
|
117
117
|
logging.getLogger('asyncio').setLevel(logging.INFO)
|
|
118
118
|
|
|
119
119
|
# Supports extended semver, unlike mas.cli.__version__
|
|
120
|
-
self.version = "
|
|
120
|
+
self.version = "15.1.0"
|
|
121
121
|
self.h1count = 0
|
|
122
122
|
self.h2count = 0
|
|
123
123
|
|
mas/cli/install/app.py
CHANGED
|
@@ -1270,7 +1270,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
|
|
|
1270
1270
|
)
|
|
1271
1271
|
prepareInstallSecrets(
|
|
1272
1272
|
dynClient=self.dynamicClient,
|
|
1273
|
-
|
|
1273
|
+
namespace=pipelinesNamespace,
|
|
1274
1274
|
slsLicenseFile=self.slsLicenseFileSecret,
|
|
1275
1275
|
additionalConfigs=self.additionalConfigsSecret,
|
|
1276
1276
|
podTemplates=self.podTemplatesSecret,
|
mas/cli/install/catalogs.py
CHANGED
|
@@ -9,18 +9,19 @@
|
|
|
9
9
|
# *****************************************************************************
|
|
10
10
|
supportedCatalogs = {
|
|
11
11
|
"amd64": [
|
|
12
|
+
"v9-250731-amd64",
|
|
12
13
|
"v9-250624-amd64",
|
|
13
14
|
"v9-250501-amd64",
|
|
14
15
|
"v9-250403-amd64",
|
|
15
|
-
"v9-250306-amd64",
|
|
16
16
|
],
|
|
17
17
|
"s390x": [
|
|
18
|
+
"v9-250731-s390x",
|
|
18
19
|
"v9-250624-s390x",
|
|
19
20
|
"v9-250501-s390x",
|
|
20
21
|
"v9-250403-s390x",
|
|
21
|
-
"v9-250306-s390x",
|
|
22
22
|
],
|
|
23
23
|
"ppc64le": [
|
|
24
|
+
"v9-250731-ppc64le",
|
|
24
25
|
"v9-250624-ppc64le",
|
|
25
26
|
],
|
|
26
27
|
}
|
mas/cli/install/params.py
CHANGED
|
@@ -153,29 +153,6 @@ optionalParams = [
|
|
|
153
153
|
"mas_arcgis_channel",
|
|
154
154
|
# Guided Tour
|
|
155
155
|
"mas_enable_walkme",
|
|
156
|
-
# Aibroker
|
|
157
|
-
"mas_aibroker_storage_provider",
|
|
158
|
-
"mas_aibroker_storage_accesskey",
|
|
159
|
-
"mas_aibroker_storage_secretkey",
|
|
160
|
-
"mas_aibroker_storage_host",
|
|
161
|
-
"mas_aibroker_storage_port",
|
|
162
|
-
"mas_aibroker_storage_ssl",
|
|
163
|
-
"mas_aibroker_storage_region",
|
|
164
|
-
"mas_aibroker_storage_pipelines_bucket",
|
|
165
|
-
"mas_aibroker_storage_tenants_bucket",
|
|
166
|
-
"mas_aibroker_storage_templates_bucket",
|
|
167
|
-
"mas_aibroker_tenant_name",
|
|
168
|
-
"mas_aibroker_watsonxai_apikey",
|
|
169
|
-
"mas_aibroker_watsonxai_url",
|
|
170
|
-
"mas_aibroker_watsonxai_project_id",
|
|
171
|
-
"mas_aibroker_watsonx_action",
|
|
172
|
-
"mas_aibroker_db_host",
|
|
173
|
-
"mas_aibroker_db_port",
|
|
174
|
-
"mas_aibroker_db_user",
|
|
175
|
-
"mas_aibroker_db_database",
|
|
176
|
-
"mas_aibroker_db_secret_name",
|
|
177
|
-
"mas_aibroker_db_secret_key",
|
|
178
|
-
"mas_aibroker_db_secret_value",
|
|
179
156
|
# Facilities
|
|
180
157
|
"mas_ws_facilities_size",
|
|
181
158
|
"mas_ws_facilities_routes_timeout",
|