[minor] Add support For Installation and FVT setup for Aiservice 9.1.x #79
Conversation
Bhautik-Vala
changed the title
Bhautik-Vala
requested review from
durera,
andrercm,
sanjayprab,
terenceq,
whitfiea,
alequint and
leo-miran
as code owners
| {%- if grafana_action is defined and grafana_action != "" %} | ||
| # Grafana | ||
| # ------------------------------------------------------------------------- | ||
| - name: grafana_action | ||
| value: "{{ grafana_action }}" | ||
| - name: grafana_v5_namespace | ||
| value: "{{ grafana_v5_namespace }}" | ||
| - name: grafana_instance_storage_size | ||
| value: "{{ grafana_instance_storage_size }}" | ||
| {%- endif %} |
| # MAS Workspace | ||
| # ------------------------------------------------------------------------- | ||
| - name: mas_workspace_id | ||
| value: "{{ mas_workspace_id }}" | ||
| - name: mas_workspace_name | ||
| value: "{{ mas_workspace_name }}" |
| - name: artifactory_token | ||
| value: "{{ artifactory_token }}" | ||
| {%- endif %} | ||
| {%- if ibmcloud_apikey is defined and ibmcloud_resourcegroup != "" %} |
There was a problem hiding this comment.
A large portion of these variables don;'t seem to be related to aibroker? Are these all needed?
There was a problem hiding this comment.
Yes, this looks like a copy/paste of the mas install pipeline run ... this needs to be fixed to only be the params used by aiservice install
| apiVersion: tekton.dev/v1beta1 | ||
| kind: PipelineRun | ||
| metadata: | ||
| name: "{{mas_instance_id}}-install-{{ timestamp }}" |
There was a problem hiding this comment.
can the pipelinerun name be aiservice-install? Also why is mas_instance_id related to this?
src/mas/devops/tekton.py
Outdated
| """ | ||
| Create a PipelineRun to install the chosen MAS instance (and selected dependencies) | ||
| """ | ||
| instanceId = params["mas_instance_id"] | ||
| namespace = f"mas-{instanceId}-pipelines" | ||
| timestamp = launchPipelineRun(dynClient, namespace, "pipelinerun-aiservice-install", params) | ||
|
|
||
| pipelineURL = f"{getConsoleURL(dynClient)}/k8s/ns/mas-{instanceId}-pipelines/tekton.dev~v1beta1~PipelineRun/{instanceId}-install-{timestamp}" |
There was a problem hiding this comment.
Not sure why the mas_instance_id is related to this.
There was a problem hiding this comment.
we have the logic in cli which generate namspace for pipeline using mas_instance_id combination so that's why have to use this params and also in some role of aiservice also we are using mas_instance_id as env var so we need this var.
There was a problem hiding this comment.
@Bhautik-Vala the issue is that the variable name is wrong. You would be using the value of this to be the aiservice instance id not the mas instanceid.
| @@ -77,7 +77,9 @@ mas_visualinspection_version: | |||
| 9.0.x: 9.0.8 # updated | |||
| 8.10.x: 8.8.4 # No Update | |||
| 8.11.x: 8.9.11 # updated | |||
|
|
|||
| mas_aibroker_version: | |||
There was a problem hiding this comment.
aibroker or aiservice, I thought we were using the latter now?
| Create a PipelineRun to install the Aiservice | ||
| """ | ||
| instanceId = params["mas_instance_id"] | ||
| namespace = f"mas-{instanceId}-pipelines" |
There was a problem hiding this comment.
Unless the aiservice is part of the mas instance, it should not be using the mas-instanceid-pipelines namespace. This is only for pipelines that are scoped to the mas instance.
e.g.
- we use mas-pipelines namespace for the cluster-scoped update
- we use mas-instanceid-pipelines for the instance-scoped upgrade, install, and uninstall
| - name: artifactory_token | ||
| value: "{{ artifactory_token }}" | ||
| {%- endif %} | ||
| {%- if ibmcloud_apikey is defined and ibmcloud_resourcegroup != "" %} |
There was a problem hiding this comment.
Yes, this looks like a copy/paste of the mas install pipeline run ... this needs to be fixed to only be the params used by aiservice install
ISSUES: MASAIB-7, MASAIB-761
Introduce new Command mas aiservice-install specifically for installation of aiservice 9.1.x or above, So Add PipelineRun ( pipelinerun-aiservice-install ) for aiservice-install Pipeline.