Skip to content

[patch] Updates to support mas install with ECK #4

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.

Sign up for GitHub

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

Merged
durera merged 2 commits into from
Jun 28, 2024
Merged

[patch] Updates to support mas install with ECK #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e430cce
[patch] Updates to support mas install with ECK
durera Jun 27, 2024
7146cc8
Fix podtemplates support
durera Jun 28, 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
5 changes: 1 addition & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ def get_version(rel_path):
author='David Parker',
author_email='parkerda@uk.ibm.com',
package_dir={'': 'src'},
packages=find_namespace_packages(where='src', include=[
'mas.devops',
'mas.devops.templates'
]),
packages=find_namespace_packages(where='src'),
include_package_data=True,
url='https://github.com/ibm-mas/python-devops',
license='Eclipse Public License - v1.0',
Expand Down
111 changes: 47 additions & 64 deletions src/mas/devops/tekton.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,95 +134,78 @@ def preparePipelinesNamespace(dynClient: DynamicClient, instanceId: str=None, st
logger.debug(configPVC)
sleep(15)

def prepareInstallSecrets(dynClient: DynamicClient, instanceId: str, slsLicenseFile: str, additionalConfigs: dict=None, podTemplatesDir: str=None) -> None:
def prepareInstallSecrets(dynClient: DynamicClient, instanceId: str, slsLicenseFile: str, additionalConfigs: dict=None, podTemplates: str=None) -> None:
namespace=f"mas-{instanceId}-pipelines"
secretsAPI = dynClient.resources.get(api_version="v1", kind="Secret")

# Clean up existing secrets
# 1. Secret/pipeline-additional-configs
# -------------------------------------------------------------------------
# Must exist, but can be empty
try:
secretsAPI.delete(name="pipeline-additional-configs", namespace=namespace)
except NotFoundError:
pass

if additionalConfigs is None:
additionalConfigs={
"apiVersion": "v1",
"kind": "Secret",
"type": "Opaque",
"metadata": {
"name": "pipeline-additional-configs"
}
}
secretsAPI.create(body=additionalConfigs, namespace=namespace)

# 2. Secret/pipeline-sls-entitlement
# -------------------------------------------------------------------------
try:
secretsAPI.delete(name="pipeline-sls-entitlement", namespace=namespace)
except NotFoundError:
pass

# TODO: Convert this to using secretsAPI.create()
result = kubectl.run(subcmd_args=['-n', namespace, 'create', 'secret', 'generic', 'pipeline-sls-entitlement', '--from-file', slsLicenseFile])
for line in result.split("\n"):
logger.debug(line)

# 3. Secret/pipeline-certificates
# -------------------------------------------------------------------------
# Must exist. It could be an empty secret at the first place before customer configure it
try:
secretsAPI.delete(name="pipeline-pod-templates", namespace=namespace)
secretsAPI.delete(name="pipeline-certificates", namespace=namespace)
except NotFoundError:
pass

certs={
"apiVersion": "v1",
"kind": "Secret",
"type": "Opaque",
"metadata": {
"name": "pipeline-certificates"
}
}
secretsAPI.create(body=certs, namespace=namespace)

# 4. Secret/pipeline-pod-templates
# -------------------------------------------------------------------------
# Must exist, but can be empty
try:
secretsAPI.delete(name="pipeline-certificates", namespace=namespace)
secretsAPI.delete(name="pipeline-pod-templates", namespace=namespace)
except NotFoundError:
pass

# Create new secrets
if additionalConfigs is None:
additionalConfigs={
if podTemplates is None:
podTemplates={
"apiVersion": "v1",
"kind": "Secret",
"type": "Opaque",
"metadata": {
"name": "pipeline-additional-configs"
"name": "pipeline-pod-templates"
}
}
# pipeline-additional-configs must exist (otherwise the suite-install step will hang), but can be empty
secretsAPI.create(body=additionalConfigs, namespace=namespace)

result = kubectl.run(subcmd_args=['-n', namespace, 'create', 'secret', 'generic', 'pipeline-sls-entitlement', '--from-file', slsLicenseFile])
for line in result.split("\n"):
logger.debug(line)

# pipeline-certificates must exist. It could be an empty secret at the first place before customer configure it
result = kubectl.run(subcmd_args=['-n', namespace, 'create', 'secret', 'generic', 'pipeline-certificates'])
for line in result.split("\n"):
logger.debug(line)
secretsAPI.create(body=podTemplates, namespace=namespace)

if podTemplatesDir is not None:
podTemplatesCmd = [
'-n', namespace, 'create', 'secret', 'generic', 'pipeline-pod-templates',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-bascfg.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-pushnotificationcfg.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-scimcfg.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-slscfg.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-smtpcfg.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-coreidp.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-suite.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-data-dictionary-assetdatadictionary.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-actions.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-auth.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-datapower.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-devops.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-dm.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-dsc.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-edgeconfig.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-fpl.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-guardian.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-iot.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-mbgx.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-mfgx.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-monitor.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-orgmgmt.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-provision.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-registry.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-state.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-iot-webui.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-manage-manageapp.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-manage-manageworkspace.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-manage-imagestitching.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-manage-manageaccelerators.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-manage-healthextaccelerator.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-manage-slackproxy.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-mas-manage-healthextworkspace.yml',
'--from-file', f'{podTemplatesDir}:{podTemplatesDir}/ibm-sls-licenseservice.yml',
]
result = kubectl.run(subcmd_args=podTemplatesCmd)
for line in result.split("\n"):
logger.debug(line)
else:
result = kubectl.run(subcmd_args=['-n', namespace, 'create', 'secret', 'generic', 'pipeline-pod-templates'])
for line in result.split("\n"):
logger.debug(line)

def testCLI() -> None:
pass
Expand Down
24 changes: 24 additions & 0 deletions src/mas/devops/templates/pipelinerun-install.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,24 @@ spec:
# -------------------------------------------------------------------------
- name: eck_action
value: "{{ eck_action }}"

- name: eck_enable_elasticsearch
value: "{{ eck_enable_elasticsearch }}"
- name: eck_enable_kibana
value: "{{ eck_enable_kibana }}"
- name: eck_enable_logstash
value: "{{ eck_enable_logstash }}"
- name: eck_enable_filebeat
value: "{{ eck_enable_filebeat }}"

{%- if eck_remote_es_hosts is defined %}
- name: eck_remote_es_hosts
value: "{{ eck_remote_es_hosts }}"
- name: eck_remote_es_username
value: "{{ eck_remote_es_username }}"
- name: eck_remote_es_password
value: "{{ eck_remote_es_password }}"
{%- endif %}
{%- endif %}
{%- if turbonomic_server_url is defined %}

Expand Down Expand Up @@ -421,6 +439,12 @@ spec:
- name: enable_ipv6
value: "{{ enable_ipv6 }}"
{%- endif %}
{%- if mas_superuser_username is defined and mas_superuser_password is defined %}
- name: mas_superuser_username
value: "{{ mas_superuser_username }}"
- name: mas_superuser_password
value: "{{ mas_superuser_password }}"
{%- endif %}

# MAS Workspace
# -------------------------------------------------------------------------
Expand Down