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.

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

[patch] Bump secret creation earlier in Turbonomic role #1487

Merged
merged 2 commits into from
Sep 25, 2024
Merged

[patch] Bump secret creation earlier in Turbonomic role #1487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5396c90
[patch] Turbonomic pod sometimes fails authentication
Aymen-Ben-S Sep 24, 2024
63ba03f
Merge branch 'master' into turbo
Aymen-Ben-S Sep 24, 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
28 changes: 14 additions & 14 deletions ibm/mas_devops/roles/turbonomic/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,16 @@
set_fact:
kubeturbo_namespace_fsgroup: "{{ kubeturbo_namespace_output.resources[0].metadata.annotations['openshift.io/sa.scc.uid-range'] | regex_search(regex) }}"

# 3. Create Turbonomic secret
# -----------------------------------------------------------------------------
- name: Create the Turbonomic Secret for Kubeturbo
no_log: true
kubernetes.core.k8s:
state: present
namespace: "{{ kubeturbo_namespace }}"
template: templates/turbonomic-secret.yml.j2

# 3. Lookup Kubeturbo package information
# 4. Lookup Kubeturbo package information
# -----------------------------------------------------------------------------
- name: Get Kubeturbo package manifest
kubernetes.core.k8s_info:
Expand Down Expand Up @@ -69,7 +77,7 @@
- "Turbonomic Target Name.................... {{ turbonomic_target_name }}"


# 4. Create subscription and Operator Group
# 5. Create subscription and Operator Group
# -----------------------------------------------------------------------------
- name: "Create Kubeturbo operator group"
kubernetes.core.k8s:
Expand All @@ -87,15 +95,15 @@
status: "False"


# 5. Deploy Kubeturbo CRD
# 6. Deploy Kubeturbo CRD
# -----------------------------------------------------------------------------
- name: "Wait until the Kubeturbo CRD is available"
include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml"
vars:
crd_name: kubeturbos.charts.helm.k8s.io


# 6. Wait until Kubeturbo Operator is ready
# 7. Wait until Kubeturbo Operator is ready
# -----------------------------------------------------------------------------
- name: "Wait for {{ kubeturbo_sub_name }} to be ready (60s delay)"
kubernetes.core.k8s_info:
Expand All @@ -115,21 +123,13 @@
delay: 60 # 1 minute


# 7. Create Kubeturbo Custom Resource & Secret
# 8. Create Kubeturbo Custom Resource & Secret
# -----------------------------------------------------------------------------
- name: "Create Kubeturbo Custom Resource"
kubernetes.core.k8s:
definition: "{{ lookup('template', 'templates/kubeturbo-cr.yml.j2') }}"

- name: Create the Turbonomic Secret for Kubeturbo
no_log: true
kubernetes.core.k8s:
state: present
namespace: "{{ kubeturbo_namespace }}"
template: templates/turbonomic-secret.yml.j2


# 8. Wait Kubeturbo Custom Resource to be complete.
# 9. Wait Kubeturbo Custom Resource to be complete.
# -----------------------------------------------------------------------------
- name: "Wait for Kubeturbo Custom Resource to be ready (60s delay)"
kubernetes.core.k8s_info:
Expand Down
Loading