mas-cli 14.1.0__py3-none-any.whl → 15.0.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.

Files changed (15) hide show
  1. mas/cli/__init__.py +1 -1
  2. mas/cli/aiservice/install/app.py +209 -133
  3. mas/cli/aiservice/install/argBuilder.py +54 -120
  4. mas/cli/aiservice/install/argParser.py +138 -373
  5. mas/cli/aiservice/install/params.py +30 -50
  6. mas/cli/aiservice/install/summarizer.py +48 -106
  7. mas/cli/cli.py +1 -1
  8. mas/cli/install/app.py +1 -1
  9. mas/cli/install/params.py +0 -23
  10. mas/cli/templates/ibm-mas-tekton.yaml +8748 -11094
  11. {mas_cli-14.1.0.dist-info → mas_cli-15.0.0.dist-info}/METADATA +1 -1
  12. {mas_cli-14.1.0.dist-info → mas_cli-15.0.0.dist-info}/RECORD +15 -15
  13. {mas_cli-14.1.0.data → mas_cli-15.0.0.data}/scripts/mas-cli +0 -0
  14. {mas_cli-14.1.0.dist-info → mas_cli-15.0.0.dist-info}/WHEEL +0 -0
  15. {mas_cli-14.1.0.dist-info → mas_cli-15.0.0.dist-info}/top_level.txt +0 -0
mas/cli/aiservice/install/argBuilder.py CHANGED
@@ -36,7 +36,7 @@ class aiServiceInstallArgBuilderMixin():
36
36
  command += f" --ibm-entitlement-key $IBM_ENTITLEMENT_KEY{newline}"
37
37
 
38
38
  # Aibroker Instance Id
39
- command += f" --aibroker-instance-id \"{self.getParam('aibroker_instance_id')}\"{newline}"
39
+ command += f" --aiservice-instance-id \"{self.getParam('aiservice_instance_id')}\"{newline}"
40
40
 
41
41
  # MAS Advanced Configuration
42
42
  # -----------------------------------------------------------------------------
@@ -54,7 +54,7 @@ class aiServiceInstallArgBuilderMixin():
54
54
  # IBM Suite License Service
55
55
  # -----------------------------------------------------------------------------
56
56
  if self.getParam("sls_namespace") and self.getParam("sls_namespace") != "ibm-sls":
57
- if self.getParam("aibroker_instance_id") and self.getParam("sls_namespace") == f"mas-{self.getParam('mas_instance_id')}-sls":
57
+ if self.getParam("aiservice_instance_id") and self.getParam("sls_namespace") == f"mas-{self.getParam('mas_instance_id')}-sls":
58
58
  command += " --dedicated-sls"
59
59
  else:
60
60
  command += f" --sls-namespace \"{self.getParam('sls_namespace')}\""
@@ -78,61 +78,11 @@ class aiServiceInstallArgBuilderMixin():
78
78
 
79
79
  # Aibroker Channel
80
80
  # -----------------------------------------------------------------------------
81
- if self.installAiBroker:
82
- command += f" --aibroker-channel \"{self.getParam('mas_app_channel_aibroker')}\"{newline}"
81
+ command += f" --aiservice-channel \"{self.getParam('aiservice_channel')}\"{newline}"
83
82
 
84
83
  # IBM Db2 Universal Operator
85
84
  # -----------------------------------------------------------------------------
86
- if self.getParam('db2_action_system') == "install" or self.getParam('db2_action_manage') == "install" or self.getParam('db2_action_facilities') == "install":
87
- if self.getParam('db2_action_system') == "install":
88
- command += f" --db2-system{newline}"
89
- if self.getParam('db2_action_manage') == "install":
90
- command += f" --db2-manage{newline}"
91
- if self.getParam('db2_action_facilities') == "install":
92
- command += f" --db2-facilities{newline}"
93
-
94
- if self.getParam('db2_channel') != "":
95
- command += f" --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
96
- if self.getParam('db2_namespace') != "":
97
- command += f" --db2-namespace \"{self.getParam('db2_namespace')}\"{newline}"
98
-
99
- if self.getParam('db2_type') != "":
100
- command += f" --db2-type \"{self.getParam('db2_type')}\"{newline}"
101
- if self.getParam('db2_timezone') != "":
102
- command += f" --db2-timezone \"{self.getParam('db2_timezone')}\"{newline}"
103
-
104
- if self.getParam('db2_affinity_key') != "":
105
- command += f" --db2-affinity-key \"{self.getParam('db2_affinity_key')}\"{newline}"
106
- if self.getParam('db2_affinity_value') != "":
107
- command += f" --db2-affinity_value \"{self.getParam('db2_affinity_value')}\"{newline}"
108
-
109
- if self.getParam('db2_tolerate_key') != "":
110
- command += f" --db2-tolerate-key \"{self.getParam('db2_tolerate_key')}\"{newline}"
111
- if self.getParam('db2_tolerate_value') != "":
112
- command += f" --db2-tolerate-value \"{self.getParam('db2_tolerate_value')}\"{newline}"
113
- if self.getParam('db2_tolerate_effect') != "":
114
- command += f" --db2-tolerate-effect \"{self.getParam('db2_tolerate_effect')}\"{newline}"
115
-
116
- if self.getParam('db2_cpu_requests') != "":
117
- command += f" --db2-cpu-requests \"{self.getParam('db2_cpu_requests')}\"{newline}"
118
- if self.getParam('db2_cpu_limits') != "":
119
- command += f" --db2-cpu-limits \"{self.getParam('db2_cpu_limits')}\"{newline}"
120
-
121
- if self.getParam('db2_memory_requests') != "":
122
- command += f" --db2-memory-requests \"{self.getParam('db2_memory_requests')}\"{newline}"
123
- if self.getParam('db2_memory_limits') != "":
124
- command += f" --db2-memory-limits \"{self.getParam('db2_memory_limits')}\"{newline}"
125
-
126
- if self.getParam('db2_backup_storage_size') != "":
127
- command += f" --db2-backup-storage \"{self.getParam('db2_backup_storage_size')}\"{newline}"
128
- if self.getParam('db2_data_storage_size') != "":
129
- command += f" --db2-data-storage \"{self.getParam('db2_data_storage_size')}\"{newline}"
130
- if self.getParam('db2_logs_storage_size') != "":
131
- command += f" --db2-logs-storage \"{self.getParam('db2_logs_storage_size')}\"{newline}"
132
- if self.getParam('db2_meta_storage_size') != "":
133
- command += f" --db2-meta-storage \"{self.getParam('db2_meta_storage_size')}\"{newline}"
134
- if self.getParam('db2_temp_storage_size') != "":
135
- command += f" --db2-temp-storage \"{self.getParam('db2_temp_storage_size')}\"{newline}"
85
+ command += f" --db2-aiservice{newline}"
136
86
 
137
87
  # Development Mode
138
88
  # -----------------------------------------------------------------------------
@@ -152,8 +102,6 @@ class aiServiceInstallArgBuilderMixin():
152
102
  command += f" --no-wait-for-pvc{newline}"
153
103
  if self.getParam('skip_pre_check') is True:
154
104
  command += f" --skip-pre-check{newline}"
155
- if self.getParam('skip_grafana_install') is True:
156
- command += f" --skip-grafana-install{newline}"
157
105
  if self.getParam('image_pull_policy') != "":
158
106
  command += f" --image-pull-policy {self.getParam('image_pull_policy')}{newline}"
159
107
  if self.getParam('service_account_name') != "":
@@ -161,80 +109,66 @@ class aiServiceInstallArgBuilderMixin():
161
109
 
162
110
  # Aibroker Advanced Settings
163
111
  # -----------------------------------------------------------------------------
164
- if self.getParam('mas_aibroker_storage_provider') != "":
165
- command += f" --mas-aibroker-storage-provider \"{self.getParam('mas_aibroker_storage_provider')}\"{newline}"
166
- if self.getParam('mas_aibroker_storage_accesskey') != "":
167
- command += f" --mas-aibroker-storage-accesskey \"{self.getParam('mas_aibroker_storage_accesskey')}\"{newline}"
168
- if self.getParam('mas_aibroker_storage_secretkey') != "":
169
- command += f" --mas-aibroker-storage-secretkey \"{self.getParam('mas_aibroker_storage_secretkey')}\"{newline}"
170
- if self.getParam('mas_aibroker_storage_host') != "":
171
- command += f" --mas-aibroker-storage-host \"{self.getParam('mas_aibroker_storage_host')}\"{newline}"
172
- if self.getParam('mas_aibroker_storage_port') != "":
173
- command += f" --mas-aibroker-storage-port \"{self.getParam('mas_aibroker_storage_port')}\"{newline}"
174
- if self.getParam('mas_aibroker_storage_ssl') != "":
175
- command += f" --mas-aibroker-storage-ssl \"{self.getParam('mas_aibroker_storage_ssl')}\"{newline}"
176
- if self.getParam('mas_aibroker_storage_region') != "":
177
- command += f" --mas-aibroker-storage-region \"{self.getParam('mas_aibroker_storage_region')}\"{newline}"
178
- if self.getParam('mas_aibroker_storage_pipelines_bucket') != "":
179
- command += f" --mas-aibroker-storage-pipelines-bucket \"{self.getParam('mas_aibroker_storage_pipelines_bucket')}\"{newline}"
180
- if self.getParam('mas_aibroker_storage_tenants_bucket') != "":
181
- command += f" --mas-aibroker-storage-tenants-bucket \"{self.getParam('mas_aibroker_storage_tenants_bucket')}\"{newline}"
182
- if self.getParam('mas_aibroker_storage_templates_bucket') != "":
183
- command += f" --mas-aibroker-storage-templates-bucket \"{self.getParam('mas_aibroker_storage_templates_bucket')}\"{newline}"
184
- if self.getParam('mas_aibroker_tenant_name') != "":
185
- command += f" --mas-aibroker-tenant-name \"{self.getParam('mas_aibroker_tenant_name')}\"{newline}"
186
- if self.getParam('mas_aibroker_watsonxai_apikey') != "":
187
- command += f" --mas-aibroker-watsonxai-apikey \"{self.getParam('mas_aibroker_watsonxai_apikey')}\"{newline}"
188
- if self.getParam('mas_aibroker_watsonxai_url') != "":
189
- command += f" --mas-aibroker-watsonxai-url \"{self.getParam('mas_aibroker_watsonxai_url')}\"{newline}"
190
- if self.getParam('mas_aibroker_watsonxai_project_id') != "":
191
- command += f" --mas-aibroker-watsonxai-project-id \"{self.getParam('mas_aibroker_watsonxai_project_id')}\"{newline}"
192
- if self.getParam('mas_aibroker_watsonx_action') != "":
193
- command += f" --mas-aibroker-watsonx-action \"{self.getParam('mas_aibroker_watsonx_action')}\"{newline}"
194
- if self.getParam('mas_aibroker_db_host') != "":
195
- command += f" --mas-aibroker-db-host \"{self.getParam('mas_aibroker_db_host')}\"{newline}"
196
- if self.getParam('mas_aibroker_db_port') != "":
197
- command += f" --mas-aibroker-db-port \"{self.getParam('mas_aibroker_db_port')}\"{newline}"
198
- if self.getParam('mas_aibroker_db_user') != "":
199
- command += f" --mas-aibroker-db-user \"{self.getParam('mas_aibroker_db_user')}\"{newline}"
200
- if self.getParam('mas_aibroker_db_database') != "":
201
- command += f" --mas-aibroker-db-database \"{self.getParam('mas_aibroker_db_database')}\"{newline}"
202
- if self.getParam('mas_aibroker_db_secret_name') != "":
203
- command += f" --mas-aibroker-db-secret-name \"{self.getParam('mas_aibroker_db_secret_name')}\"{newline}"
204
- if self.getParam('mas_aibroker_db_secret_key') != "":
205
- command += f" --mas-aibroker-db-secret-key \"{self.getParam('mas_aibroker_db_secret_key')}\"{newline}"
206
- if self.getParam('mas_aibroker_db_secret_value') != "":
207
- command += f" --mas-aibroker-db-secret-value \"{self.getParam('mas_aibroker_db_secret_value')}\"{newline}"
208
- if self.getParam('mariadb_user') != "":
209
- command += f" --mariadb-user \"{self.getParam('mariadb_user')}\"{newline}"
210
- if self.getParam('mariadb_password') != "":
211
- command += f" --mariadb-password \"{self.getParam('mariadb_password')}\"{newline}"
112
+ if self.getParam('aiservice_storage_provider') != "":
113
+ command += f" --aiservice-storage-provider \"{self.getParam('aiservice_storage_provider')}\"{newline}"
114
+ if self.getParam('aiservice_storage_accesskey') != "":
115
+ command += f" --aiservice-storage-accesskey \"{self.getParam('aiservice_storage_accesskey')}\"{newline}"
116
+ if self.getParam('aiservice_storage_secretkey') != "":
117
+ command += f" --aiservice-storage-secretkey \"{self.getParam('aiservice_storage_secretkey')}\"{newline}"
118
+ if self.getParam('aiservice_storage_host') != "":
119
+ command += f" --aiservice-storage-host \"{self.getParam('aiservice_storage_host')}\"{newline}"
120
+ if self.getParam('aiservice_storage_port') != "":
121
+ command += f" --aiservice-storage-port \"{self.getParam('aiservice_storage_port')}\"{newline}"
122
+ if self.getParam('aiservice_storage_ssl') != "":
123
+ command += f" --aiservice-storage-ssl \"{self.getParam('aiservice_storage_ssl')}\"{newline}"
124
+ if self.getParam('aiservice_storage_region') != "":
125
+ command += f" --aiservice-storage-region \"{self.getParam('aiservice_storage_region')}\"{newline}"
126
+ if self.getParam('aiservice_storage_pipelines_bucket') != "":
127
+ command += f" --aiservice-storage-pipelines-bucket \"{self.getParam('aiservice_storage_pipelines_bucket')}\"{newline}"
128
+ if self.getParam('aiservice_storage_tenants_bucket') != "":
129
+ command += f" --aiservice-storage-tenants-bucket \"{self.getParam('aiservice_storage_tenants_bucket')}\"{newline}"
130
+ if self.getParam('aiservice_storage_templates_bucket') != "":
131
+ command += f" --aiservice-storage-templates-bucket \"{self.getParam('aiservice_storage_templates_bucket')}\"{newline}"
132
+
133
+ if self.getParam('aiservice_watsonxai_apikey') != "":
134
+ command += f" --aiservice-watsonxai-apikey \"{self.getParam('aiservice_watsonxai_apikey')}\"{newline}"
135
+ if self.getParam('aiservice_watsonxai_url') != "":
136
+ command += f" --aiservice-watsonxai-url \"{self.getParam('aiservice_watsonxai_url')}\"{newline}"
137
+ if self.getParam('aiservice_watsonxai_project_id') != "":
138
+ command += f" --aiservice-watsonxai-project-id \"{self.getParam('aiservice_watsonxai_project_id')}\"{newline}"
139
+ if self.getParam('aiservice_watsonx_action') != "":
140
+ command += f" --aiservice-watsonx-action \"{self.getParam('aiservice_watsonx_action')}\"{newline}"
141
+
212
142
  if self.getParam('minio_root_user') != "":
213
143
  command += f" --minio-root-user \"{self.getParam('minio_root_user')}\"{newline}"
214
144
  if self.getParam('minio_root_password') != "":
215
145
  command += f" --minio-root-password \"{self.getParam('minio_root_password')}\"{newline}"
146
+
216
147
  if self.getParam('tenant_entitlement_type') != "":
217
148
  command += f" --tenant-entitlement-type \"{self.getParam('tenant_entitlement_type')}\"{newline}"
218
149
  if self.getParam('tenant_entitlement_start_date') != "":
219
150
  command += f" --tenant-entitlement-start-date \"{self.getParam('tenant_entitlement_start_date')}\"{newline}"
220
151
  if self.getParam('tenant_entitlement_end_date') != "":
221
152
  command += f" --tenant-entitlement-end-date \"{self.getParam('tenant_entitlement_end_date')}\"{newline}"
222
- if self.getParam('mas_aibroker_s3_bucket_prefix') != "":
223
- command += f" --mas-aibroker-s3-bucket-prefix \"{self.getParam('mas_aibroker_s3_bucket_prefix')}\"{newline}"
224
- if self.getParam('mas_aibroker_s3_endpoint_url') != "":
225
- command += f" --mas-aibroker-s3-endpoint-url \"{self.getParam('mas_aibroker_s3_endpoint_url')}\"{newline}"
226
- if self.getParam('mas_aibroker_s3_region') != "":
227
- command += f" --mas-aibroker-s3-region \"{self.getParam('mas_aibroker_s3_region')}\"{newline}"
228
- if self.getParam('mas_aibroker_tenant_s3_bucket_prefix') != "":
229
- command += f" --mas-aibroker-tenant-s3-bucket-prefix \"{self.getParam('mas_aibroker_tenant_s3_bucket_prefix')}\"{newline}"
230
- if self.getParam('mas_aibroker_tenant_s3_region') != "":
231
- command += f" --mas-aibroker-tenant-s3-region \"{self.getParam('mas_aibroker_tenant_s3_region')}\"{newline}"
232
- if self.getParam('mas_aibroker_tenant_s3_endpoint_url') != "":
233
- command += f" --mas-aibroker-tenant-s3-endpoint-url \"{self.getParam('mas_aibroker_tenant_s3_endpoint_url')}\"{newline}"
234
- if self.getParam('mas_aibroker_tenant_s3_access_key') != "":
235
- command += f" --mas-aibroker-tenant-s3-access-key \"{self.getParam('mas_aibroker_tenant_s3_access_key')}\"{newline}"
236
- if self.getParam('mas_aibroker_tenant_s3_secret_key') != "":
237
- command += f" --mas-aibroker-tenant-s3-secret-key \"{self.getParam('mas_aibroker_tenant_s3_secret_key')}\"{newline}"
153
+
154
+ if self.getParam('aiservice_s3_bucket_prefix') != "":
155
+ command += f" --aiservice-s3-bucket-prefix \"{self.getParam('aiservice_s3_bucket_prefix')}\"{newline}"
156
+ if self.getParam('aiservice_s3_endpoint_url') != "":
157
+ command += f" --aiservice-s3-endpoint-url \"{self.getParam('aiservice_s3_endpoint_url')}\"{newline}"
158
+ if self.getParam('aiservice_s3_region') != "":
159
+ command += f" --aiservice-s3-region \"{self.getParam('aiservice_s3_region')}\"{newline}"
160
+
161
+ if self.getParam('aiservice_tenant_s3_bucket_prefix') != "":
162
+ command += f" --aiservice-tenant-s3-bucket-prefix \"{self.getParam('aiservice_tenant_s3_bucket_prefix')}\"{newline}"
163
+ if self.getParam('aiservice_tenant_s3_region') != "":
164
+ command += f" --aiservice-tenant-s3-region \"{self.getParam('aiservice_tenant_s3_region')}\"{newline}"
165
+ if self.getParam('aiservice_tenant_s3_endpoint_url') != "":
166
+ command += f" --aiservice-tenant-s3-endpoint-url \"{self.getParam('aiservice_tenant_s3_endpoint_url')}\"{newline}"
167
+ if self.getParam('aiservice_tenant_s3_access_key') != "":
168
+ command += f" --aiservice-tenant-s3-access-key \"{self.getParam('aiservice_tenant_s3_access_key')}\"{newline}"
169
+ if self.getParam('aiservice_tenant_s3_secret_key') != "":
170
+ command += f" --aiservice-tenant-s3-secret-key \"{self.getParam('aiservice_tenant_s3_secret_key')}\"{newline}"
171
+
238
172
  if self.getParam('rsl_url') != "":
239
173
  command += f" --rsl-url \"{self.getParam('rsl_url')}\"{newline}"
240
174
  if self.getParam('rsl_org_id') != "":