From b8d1ad9a6e02c4c4b36d1cc32a15c67a207e09a5 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Mon, 12 Feb 2024 18:41:08 +0530 Subject: [PATCH 01/11] initial commit --- .../roles/common_services/tasks/install.yml | 20 ++--- ansible/roles/common_services/tasks/main.yml | 2 +- .../roles/common_services/tasks/uninstall.yml | 84 +++++++++---------- .../templates/cs-request.bash.j2 | 6 +- .../templates/cs-request.yaml.j2 | 2 +- .../templates/cs-validation.bash.j2 | 2 +- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ansible/roles/common_services/tasks/install.yml b/ansible/roles/common_services/tasks/install.yml index 0de463345..9f83aef62 100644 --- a/ansible/roles/common_services/tasks/install.yml +++ b/ansible/roles/common_services/tasks/install.yml @@ -42,7 +42,7 @@ delay: 30 - name: Query available operands - shell: oc -n ibm-common-services get operandregistry common-service -o jsonpath='{.spec.operators[*].name}' + shell: oc -n {{ cs_operator_project_name }} get operandregistry common-service -o jsonpath='{.spec.operators[*].name}' register: oc_operands - name: Display available operands @@ -62,43 +62,43 @@ - name: Deploy generated OperandRequest shell: | - oc project ibm-common-services - oc -n ibm-common-services apply -f operandrequest.yml + oc project {{ cs_operator_project_name }} + oc -n {{ cs_operator_project_name }} apply -f operandrequest.yml args: chdir: "{{ cs_setup_dir }}" - name: Waiting for ClusterServiceVersion to initialize shell: | sleep 30 - oc -n ibm-common-services get csv --no-headers | grep -v operand-deployment-lifecycle-manager | wc -l + oc -n {{ cs_operator_project_name }} get csv --no-headers | grep -v operand-deployment-lifecycle-manager | wc -l register: csvi_count until: csvi_count.stdout|int >= 1 retries: 20 delay: 30 - name: Waiting for all ClusterServiceVersion to complete - shell: "sleep 30; oc -n ibm-common-services get csv --no-headers | grep -v Succeeded | wc -l" + shell: "sleep 30; oc -n {{ cs_operator_project_name }} get csv --no-headers | grep -v Succeeded | wc -l" register: csvc_count until: csvc_count.stdout|int == 0 retries: 45 delay: 30 - name: Make sure Mongodb is present - shell: "sleep 30; oc -n ibm-common-services get statefulset --no-headers | grep -i mongodb | wc -l" + shell: "sleep 30; oc -n {{ cs_operator_project_name }} get statefulset --no-headers | grep -i mongodb | wc -l" register: mongo_count until: mongo_count.stdout|int != 0 retries: 10 delay: 30 - name: Make sure all Statefulsets are healthy - shell: "sleep 30; oc -n ibm-common-services get statefulset --no-headers | egrep \"0/1|0/2|1/2|0/3|1/3|2/3\" | wc -l" + shell: "sleep 30; oc -n {{ cs_operator_project_name }} get statefulset --no-headers | egrep \"0/1|0/2|1/2|0/3|1/3|2/3\" | wc -l" register: statefulset_unhealthy until: statefulset_unhealthy.stdout|int == 0 retries: 30 delay: 30 - name: Make sure all jobs are completed - shell: "sleep 30; oc -n ibm-common-services get job --no-headers | egrep \"0/1|0/2|1/2|0/3|1/3|2/3\" | wc -l" + shell: "sleep 30; oc -n {{ cs_operator_project_name }} get job --no-headers | egrep \"0/1|0/2|1/2|0/3|1/3|2/3\" | wc -l" register: job_notcompleted until: job_notcompleted.stdout|int == 0 retries: 15 @@ -111,8 +111,8 @@ - name: Query console admin password shell: | - oc -n ibm-common-services get route cp-console -o jsonpath='{.spec.host}'; echo - oc -n ibm-common-services get secret platform-auth-idp-credentials -o jsonpath='{.data.admin_password}' | base64 -d + oc -n {{ cs_operator_project_name }} get route cp-console -o jsonpath='{.spec.host}'; echo + oc -n {{ cs_operator_project_name }} get secret platform-auth-idp-credentials -o jsonpath='{.data.admin_password}' | base64 -d register: cs_admin_password - name: Display console admin password diff --git a/ansible/roles/common_services/tasks/main.yml b/ansible/roles/common_services/tasks/main.yml index b96489a4d..dcdecffe2 100644 --- a/ansible/roles/common_services/tasks/main.yml +++ b/ansible/roles/common_services/tasks/main.yml @@ -33,7 +33,7 @@ - name: Get openshift projects debug: - msg: "{{ ocp_projects.stdout.find('ibm-common-services') }}" + msg: "{{ ocp_projects.stdout.find('{{ cs_operator_project_name }}') }}" - include_tasks: "uninstall.yml" when: cs_action == "uninstall" diff --git a/ansible/roles/common_services/tasks/uninstall.yml b/ansible/roles/common_services/tasks/uninstall.yml index daaacb1aa..694fa60e3 100644 --- a/ansible/roles/common_services/tasks/uninstall.yml +++ b/ansible/roles/common_services/tasks/uninstall.yml @@ -2,68 +2,68 @@ # tasks file cp4 common services uninstall - name: uninstall - removing operandrequest/common-service - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | - oc -n ibm-common-services delete operandrequest {{ cs_operator_project_name }} || true + oc -n {{ cs_operator_project_name }} delete operandrequest {{ cs_operator_project_name }} || true - name: uninstall - removing operandrequests - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | if [[ ! -z "$(oc get crd | grep operandrequests)" ]]; then - for request in $(oc -n ibm-common-services get operandrequests -o name); do + for request in $(oc -n {{ cs_operator_project_name }} get operandrequests -o name); do echo "Deleting ${request} ..." - oc -n ibm-common-services delete ${request} --ignore-not-found --timeout=60s + oc -n {{ cs_operator_project_name }} delete ${request} --ignore-not-found --timeout=60s done - for request in $(oc -n ibm-common-services get operandrequests -o name); do + for request in $(oc -n {{ cs_operator_project_name }} get operandrequests -o name); do echo "Force deleting ${request} ..." - oc -n ibm-common-services patch ${request} --type="json" -p '[{"op": "remove", "path":"/metadata/finalizers"}]' - oc -n ibm-common-services delete ${request} --ignore-not-found --timeout=10s + oc -n {{ cs_operator_project_name }} patch ${request} --type="json" -p '[{"op": "remove", "path":"/metadata/finalizers"}]' + oc -n {{ cs_operator_project_name }} delete ${request} --ignore-not-found --timeout=10s done fi - name: uninstall - removing CRs - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | if [[ ! -z "$(oc get crd | grep operator.ibm.com)" ]]; then for crd in $(oc get crd | grep operator.ibm.com | awk '{print $1}'); do echo "Checking remaining CRs for ${crd} ..." - for cr in $(oc -n ibm-common-services get ${crd} -o name); do + for cr in $(oc -n {{ cs_operator_project_name }} get ${crd} -o name); do echo "Deleting CR ${cr} ..." - oc -n ibm-common-services delete ${cr} --ignore-not-found --timeout=30s + oc -n {{ cs_operator_project_name }} delete ${cr} --ignore-not-found --timeout=30s done - for cr in $(oc -n ibm-common-services get ${crd} -o name); do + for cr in $(oc -n {{ cs_operator_project_name }} get ${crd} -o name); do echo "Force deleting CR ${cr} ..." - oc -n ibm-common-services patch ${cr} --type json -p '[{ "op": "remove", "path": "/metadata/finalizers"}]' - oc -n ibm-common-services delete ${cr} --ignore-not-found --timeout=10s + oc -n {{ cs_operator_project_name }} patch ${cr} --type json -p '[{ "op": "remove", "path": "/metadata/finalizers"}]' + oc -n {{ cs_operator_project_name }} delete ${cr} --ignore-not-found --timeout=10s done done fi - name: uninstall - validate CRs removal - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | - oc -n ibm-common-services get --no-headers operandrequest | wc -l + oc -n {{ cs_operator_project_name }} get --no-headers operandrequest | wc -l register: operand_requests until: operand_requests.stdout|int == 0 retries: 10 delay: 10 - name: uninstall - remove operandconfig and operandregistry - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | - oc -n ibm-common-services delete operandconfig {{ cs_operator_project_name }} || true - oc -n ibm-common-services delete operandregistry {{ cs_operator_project_name }} || true + oc -n {{ cs_operator_project_name }} delete operandconfig {{ cs_operator_project_name }} || true + oc -n {{ cs_operator_project_name }} delete operandregistry {{ cs_operator_project_name }} || true - name: uninstall - removing operators csv and subscriptions - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | - oc -n ibm-common-services get csv,sub -o name | grep -v operand-deployment-lifecycle-manager | grep -v ibm-common-service-operator | while read CSTARGET; do + oc -n {{ cs_operator_project_name }} get csv,sub -o name | grep -v operand-deployment-lifecycle-manager | grep -v ibm-common-service-operator | while read CSTARGET; do echo removing $CSTARGET - oc -n ibm-common-services delete $CSTARGET --ignore-not-found --timeout=5s + oc -n {{ cs_operator_project_name }} delete $CSTARGET --ignore-not-found --timeout=5s done - name: uninstall - removing cluster resources - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | oc delete --ignore-not-found=true --timeout=10s validatingwebhookconfiguration.admissionregistration.k8s.io/cert-manager-webhook oc delete --ignore-not-found=true --timeout=10s mutatingwebhookconfiguration.admissionregistration.k8s.io/ibm-common-service-webhook-configuration @@ -71,26 +71,26 @@ oc delete --ignore-not-found=true --timeout=10s securitycontextconstraints.security.openshift.io/nginx-ingress-scc - name: uninstall - remove ODLM - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | for resource in $(oc -n openshift-operators get csv,sub -o name --ignore-not-found | grep operand-deployment-lifecycle-manager); do oc -n openshift-operators delete ${resource} --ignore-not-found --timeout=30s done - for resource in $(oc -n ibm-common-services get csv,sub -o name --ignore-not-found | grep operand-deployment-lifecycle-manager); do - oc -n ibm-common-services delete ${resource} --ignore-not-found --timeout=30s + for resource in $(oc -n {{ cs_operator_project_name }} get csv,sub -o name --ignore-not-found | grep operand-deployment-lifecycle-manager); do + oc -n {{ cs_operator_project_name }} delete ${resource} --ignore-not-found --timeout=30s done - for plan in $(oc -n ibm-common-services get installplans -o name); do + for plan in $(oc -n {{ cs_operator_project_name }} get installplans -o name); do echo "Deleting ${plan} ..." - oc -n ibm-common-services delete ${plan} --ignore-not-found --timeout=10s + oc -n {{ cs_operator_project_name }} delete ${plan} --ignore-not-found --timeout=10s done - name: uninstall - remove catalog source - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | oc -n openshift-marketplace delete catalogsource opencloud-operators --ignore-not-found --timeout=10s - name: uninstall - remove common service operator - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | if [[ ! -z "$(oc get ns {{ cs_operator_project_name }} --no-headers --ignore-not-found)" ]]; then oc -n {{ cs_operator_project_name }} get csv -o name | grep ibm-common-service-operator | xargs oc -n {{ cs_operator_project_name }} delete --timeout=30s @@ -102,7 +102,7 @@ fi - name: uninstall - remove RBAC resource - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | oc delete ClusterRole ibm-common-service-webhook --ignore-not-found oc delete ClusterRoleBinding ibm-common-service-webhook --ignore-not-found @@ -111,20 +111,20 @@ oc delete RoleBinding ibmcloud-cluster-ca-cert -n kube-public --ignore-not-found oc delete Role ibmcloud-cluster-ca-cert -n kube-public --ignore-not-found -- name: uninstall - cleaning up project ibm-common-services - when: ocp_projects.stdout.find('ibm-common-services') != -1 +- name: uninstall - cleaning up project {{ cs_operator_project_name }} + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | - for CSTARGET in $(oc -n ibm-common-services get sub,csv -o name); do + for CSTARGET in $(oc -n {{ cs_operator_project_name }} get sub,csv -o name); do echo removing $CSTARGET - oc -n ibm-common-services delete $CSTARGET --ignore-not-found --timeout=20s + oc -n {{ cs_operator_project_name }} delete $CSTARGET --ignore-not-found --timeout=20s done - for CSTARGET in $(oc -n ibm-common-services get all -o name); do + for CSTARGET in $(oc -n {{ cs_operator_project_name }} get all -o name); do echo removing $CSTARGET - oc -n ibm-common-services delete $CSTARGET --ignore-not-found --timeout=20s + oc -n {{ cs_operator_project_name }} delete $CSTARGET --ignore-not-found --timeout=20s done - name: uninstall - cleaning up project common-service - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | for CSTARGET in $(oc -n {{ cs_operator_project_name }} get sub,csv -o name); do echo removing $CSTARGET @@ -135,13 +135,13 @@ oc -n {{ cs_operator_project_name }} delete $CSTARGET --ignore-not-found --timeout=20s done -- name: uninstall - delete projects {{ cs_operator_project_name }} and ibm-common-services - when: ocp_projects.stdout.find('ibm-common-services') != -1 +- name: uninstall - delete projects {{ cs_operator_project_name }} and {{ cs_operator_project_name }} + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | - oc delete project {{ cs_operator_project_name }} ibm-common-services --ignore-not-found + oc delete project {{ cs_operator_project_name }} {{ cs_operator_project_name }} --ignore-not-found - name: uninstall - validate projects removal - when: ocp_projects.stdout.find('ibm-common-services') != -1 + when: ocp_projects.stdout.find('{{ cs_operator_project_name }}') != -1 shell: | oc projects | grep {{ cs_operator_project_name }} | wc -l register: cs_projects diff --git a/ansible/roles/common_services/templates/cs-request.bash.j2 b/ansible/roles/common_services/templates/cs-request.bash.j2 index 9395944a6..c9f6b8b01 100644 --- a/ansible/roles/common_services/templates/cs-request.bash.j2 +++ b/ansible/roles/common_services/templates/cs-request.bash.j2 @@ -11,14 +11,14 @@ apiVersion: operator.ibm.com/v1alpha1 kind: OperandRequest metadata: name: common-service - namespace: ibm-common-services + namespace: {{ cs_operator_project_name }} spec: requests: - registry: common-service - registryNamespace: ibm-common-services + registryNamespace: {{ cs_operator_project_name }} operands: ENDF - for operand in `oc -n ibm-common-services get operandregistry common-service -o jsonpath='{.spec.operators[?(@.sourceName=="opencloud-operators")].name}'`; do + for operand in `oc -n {{ cs_operator_project_name }} get operandregistry common-service -o jsonpath='{.spec.operators[?(@.sourceName=="opencloud-operators")].name}'`; do if [ "X$OPERANDS_TO_DISABLE" != "X" ]; then if echo $operand | egrep -q "$OPERANDS_TO_DISABLE"; then echo " # - name: $operand" diff --git a/ansible/roles/common_services/templates/cs-request.yaml.j2 b/ansible/roles/common_services/templates/cs-request.yaml.j2 index 0e7a9166a..883402274 100644 --- a/ansible/roles/common_services/templates/cs-request.yaml.j2 +++ b/ansible/roles/common_services/templates/cs-request.yaml.j2 @@ -2,7 +2,7 @@ apiVersion: operator.ibm.com/v1alpha1 kind: OperandRequest metadata: name: common-service - namespace: ibm-common-services + namespace: {{ cs_operator_project_name }} spec: requests: - operands: diff --git a/ansible/roles/common_services/templates/cs-validation.bash.j2 b/ansible/roles/common_services/templates/cs-validation.bash.j2 index e1be7a4cc..d16a7d027 100644 --- a/ansible/roles/common_services/templates/cs-validation.bash.j2 +++ b/ansible/roles/common_services/templates/cs-validation.bash.j2 @@ -5,7 +5,7 @@ declare -i ROUND=0 declare -i count_sub=0 declare -i count_csv=0 strict_validation={{ strict_validation }} -NAMESPACE=ibm-common-services +NAMESPACE={{ cs_operator_project_name }} NAMESPACE_ODLM={{ cs_operator_project_name }} # check statefulsets to make sure running normal From 7aab4cd4b8d8ded6eccff8416e7383e8b2964099 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Wed, 13 Mar 2024 15:33:48 +0530 Subject: [PATCH 02/11] fixing the regex for grep --- ansible/roles/common_services/templates/cs-request.bash.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/common_services/templates/cs-request.bash.j2 b/ansible/roles/common_services/templates/cs-request.bash.j2 index c9f6b8b01..61aeb6fc2 100644 --- a/ansible/roles/common_services/templates/cs-request.bash.j2 +++ b/ansible/roles/common_services/templates/cs-request.bash.j2 @@ -23,7 +23,7 @@ ENDF if echo $operand | egrep -q "$OPERANDS_TO_DISABLE"; then echo " # - name: $operand" elif [ "X$OPERANDS_TO_ENABLE" != "X" ]; then - if echo $operand | egrep -q "$OPERANDS_TO_ENABLE"; then + if echo $operand | egrep -E "(^|\s)$OPERANDS_TO_ENABLE($|\s)"; then echo " - name: $operand" fi else From 62ee6033bfc50c5b1c768b30f1126d81da23885c Mon Sep 17 00:00:00 2001 From: Siddharth Date: Wed, 13 Mar 2024 16:11:21 +0530 Subject: [PATCH 03/11] Revert "fixing the regex for grep" This reverts commit 7aab4cd4b8d8ded6eccff8416e7383e8b2964099. --- ansible/roles/common_services/templates/cs-request.bash.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/common_services/templates/cs-request.bash.j2 b/ansible/roles/common_services/templates/cs-request.bash.j2 index 61aeb6fc2..c9f6b8b01 100644 --- a/ansible/roles/common_services/templates/cs-request.bash.j2 +++ b/ansible/roles/common_services/templates/cs-request.bash.j2 @@ -23,7 +23,7 @@ ENDF if echo $operand | egrep -q "$OPERANDS_TO_DISABLE"; then echo " # - name: $operand" elif [ "X$OPERANDS_TO_ENABLE" != "X" ]; then - if echo $operand | egrep -E "(^|\s)$OPERANDS_TO_ENABLE($|\s)"; then + if echo $operand | egrep -q "$OPERANDS_TO_ENABLE"; then echo " - name: $operand" fi else From 3cf1364f421a6baeb8c266c54a45b67dcd2ee063 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Thu, 18 Apr 2024 00:56:13 +0530 Subject: [PATCH 04/11] creating the operator group only when not found --- ansible/roles/common_services/tasks/install.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/roles/common_services/tasks/install.yml b/ansible/roles/common_services/tasks/install.yml index 9f83aef62..05f56ece7 100644 --- a/ansible/roles/common_services/tasks/install.yml +++ b/ansible/roles/common_services/tasks/install.yml @@ -21,7 +21,9 @@ oc apply -f catalog-source.yaml oc new-project {{ cs_operator_project_name }} sleep 5 - oc -n {{ cs_operator_project_name }} apply -f cs-group.yaml + if [[ $(oc get og -n {{ cs_operator_project_name }} --no-headers | wc -l) -eq 0 ]]; then + oc -n {{ cs_operator_project_name }} apply -f cs-group.yaml + fi oc -n {{ cs_operator_project_name }} apply -f cs-sub.yaml args: chdir: "{{ cs_setup_dir }}" From 7832c00d82e4353e2f244b4018935f40c912297e Mon Sep 17 00:00:00 2001 From: Siddharth Date: Mon, 22 Apr 2024 16:02:17 +0530 Subject: [PATCH 05/11] fixing opreq fetching from operandregistry --- ansible/roles/common_services/templates/cs-request.bash.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/common_services/templates/cs-request.bash.j2 b/ansible/roles/common_services/templates/cs-request.bash.j2 index c9f6b8b01..8a29d41cc 100644 --- a/ansible/roles/common_services/templates/cs-request.bash.j2 +++ b/ansible/roles/common_services/templates/cs-request.bash.j2 @@ -18,7 +18,7 @@ spec: registryNamespace: {{ cs_operator_project_name }} operands: ENDF - for operand in `oc -n {{ cs_operator_project_name }} get operandregistry common-service -o jsonpath='{.spec.operators[?(@.sourceName=="opencloud-operators")].name}'`; do + for operand in `oc -n {{ cs_operator_project_name }} get operandregistry common-service -o jsonpath='{.spec.operators[*].name}'`; do if [ "X$OPERANDS_TO_DISABLE" != "X" ]; then if echo $operand | egrep -q "$OPERANDS_TO_DISABLE"; then echo " # - name: $operand" From b49b3fa491b723615006e8db818832c5edb4ab85 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Tue, 28 May 2024 20:12:53 +0530 Subject: [PATCH 06/11] temp commenting the mongo sts check --- .../roles/common_services/tasks/install.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible/roles/common_services/tasks/install.yml b/ansible/roles/common_services/tasks/install.yml index 05f56ece7..89e3f5307 100644 --- a/ansible/roles/common_services/tasks/install.yml +++ b/ansible/roles/common_services/tasks/install.yml @@ -85,12 +85,12 @@ retries: 45 delay: 30 -- name: Make sure Mongodb is present - shell: "sleep 30; oc -n {{ cs_operator_project_name }} get statefulset --no-headers | grep -i mongodb | wc -l" - register: mongo_count - until: mongo_count.stdout|int != 0 - retries: 10 - delay: 30 +# - name: Make sure Mongodb is present +# shell: "sleep 30; oc -n {{ cs_operator_project_name }} get statefulset --no-headers | grep -i mongodb | wc -l" +# register: mongo_count +# until: mongo_count.stdout|int != 0 +# retries: 10 +# delay: 30 - name: Make sure all Statefulsets are healthy shell: "sleep 30; oc -n {{ cs_operator_project_name }} get statefulset --no-headers | egrep \"0/1|0/2|1/2|0/3|1/3|2/3\" | wc -l" @@ -106,10 +106,10 @@ retries: 15 delay: 30 -- name: Validation with statefulsets and jobs - shell: "bash cs-validation.bash" - args: - chdir: "{{ cs_setup_dir }}" +# - name: Validation with statefulsets and jobs +# shell: "bash cs-validation.bash" +# args: +# chdir: "{{ cs_setup_dir }}" - name: Query console admin password shell: | From 239ee907e2257966f59d54d5188f9eb630fcf3e6 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Mon, 29 Jul 2024 19:10:53 +0530 Subject: [PATCH 07/11] Remove unnecessary python3 install --- ansible/csi-cephfs-fyre-play/csi-cephfs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ansible/csi-cephfs-fyre-play/csi-cephfs.yml b/ansible/csi-cephfs-fyre-play/csi-cephfs.yml index 5ce7edba6..2dfb71088 100644 --- a/ansible/csi-cephfs-fyre-play/csi-cephfs.yml +++ b/ansible/csi-cephfs-fyre-play/csi-cephfs.yml @@ -3,9 +3,6 @@ hosts: bastion gather_facts: no tasks: - - name: python_install_fyre - include_role: - name: python_install_fyre - name: Gathering Facts setup: - name: git_install_fyre From cb1baddd620fe82fe3f961fb1179640f1cb1d00f Mon Sep 17 00:00:00 2001 From: hjoshua Date: Thu, 31 Oct 2024 15:39:29 -0400 Subject: [PATCH 08/11] Update csi-ceph.sh --- ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh index 44afb0de4..6361588b5 100755 --- a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh +++ b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh @@ -57,7 +57,8 @@ fi echo "setup Docker registry image pull secrets exit" echo "Doing operator-openshift.yaml" -oc create -f $rookPath/operator-openshift.yaml +cat $rootPath/operator-openshift.yaml | sed 's#image: rook/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/rook/ceph#' > /tmp/operator-openshift.yaml +oc create -f /tmp/operator-openshift.yaml echo "operator-openshift.yaml exit $?" sleep_count=30 while [[ $sleep_count -gt 0 ]]; do @@ -77,8 +78,10 @@ echo "Exit from useAllDevice $?" echo "Doing sed of deviceFilter" sed -i 's/#deviceFilter:/deviceFilter: ^vd[b-z]$/g' $rookPath/cluster.yaml echo "Exit from deviceFilter $?" +echo "Patching cluster.yaml" +cat $rootPath/cluster.yaml | sed 's#image: ceph/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/ceph/ceph#' > /tmp/cluster.yaml echo "Doing cluster.yaml create" -oc create -f $rookPath/cluster.yaml +oc create -f /tmp/cluster.yaml echo "Exit from cluster.yaml $?" num_worker_nodes=$(oc get no | tr -s ' ' | cut -f3 -d' ' | grep worker | wc -l) From 99a34429d509612e5301d743e22a62eab552c3e5 Mon Sep 17 00:00:00 2001 From: hjoshua Date: Thu, 31 Oct 2024 21:22:03 -0400 Subject: [PATCH 09/11] Update csi-ceph.sh --- ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh index 6361588b5..cba739057 100755 --- a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh +++ b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh @@ -58,7 +58,8 @@ echo "setup Docker registry image pull secrets exit" echo "Doing operator-openshift.yaml" cat $rootPath/operator-openshift.yaml | sed 's#image: rook/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/rook/ceph#' > /tmp/operator-openshift.yaml -oc create -f /tmp/operator-openshift.yaml +cat /tmp/operator-openshift.yaml +oc create -f /tmp/operator-openshift.yaml echo "operator-openshift.yaml exit $?" sleep_count=30 while [[ $sleep_count -gt 0 ]]; do @@ -81,6 +82,7 @@ echo "Exit from deviceFilter $?" echo "Patching cluster.yaml" cat $rootPath/cluster.yaml | sed 's#image: ceph/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/ceph/ceph#' > /tmp/cluster.yaml echo "Doing cluster.yaml create" +cat /tmp/cluster.yaml oc create -f /tmp/cluster.yaml echo "Exit from cluster.yaml $?" From 71d0769a22e9d8a1728a5732b4aa0d3cb21e8993 Mon Sep 17 00:00:00 2001 From: hjoshua Date: Thu, 31 Oct 2024 22:04:49 -0400 Subject: [PATCH 10/11] Update csi-ceph.sh --- ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh index cba739057..eb1468ae0 100755 --- a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh +++ b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh @@ -57,8 +57,7 @@ fi echo "setup Docker registry image pull secrets exit" echo "Doing operator-openshift.yaml" -cat $rootPath/operator-openshift.yaml | sed 's#image: rook/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/rook/ceph#' > /tmp/operator-openshift.yaml -cat /tmp/operator-openshift.yaml +cat $rootPath/operator-openshift.yaml | sed 's#image: rook/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/rook/ceph#' | kubectl apply -f - oc create -f /tmp/operator-openshift.yaml echo "operator-openshift.yaml exit $?" sleep_count=30 @@ -79,10 +78,8 @@ echo "Exit from useAllDevice $?" echo "Doing sed of deviceFilter" sed -i 's/#deviceFilter:/deviceFilter: ^vd[b-z]$/g' $rookPath/cluster.yaml echo "Exit from deviceFilter $?" -echo "Patching cluster.yaml" -cat $rootPath/cluster.yaml | sed 's#image: ceph/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/ceph/ceph#' > /tmp/cluster.yaml echo "Doing cluster.yaml create" -cat /tmp/cluster.yaml +cat $rootPath/cluster.yaml | sed 's#image: ceph/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/ceph/ceph#' | kubectl apply -f - oc create -f /tmp/cluster.yaml echo "Exit from cluster.yaml $?" From 770d50d0e8474943a4f2b825740f06caa5c7d6f4 Mon Sep 17 00:00:00 2001 From: hjoshua Date: Thu, 31 Oct 2024 22:24:23 -0400 Subject: [PATCH 11/11] Update csi-ceph.sh --- ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh index eb1468ae0..4aaa1b079 100755 --- a/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh +++ b/ansible/roles/csi_cephfs_fyre/files/csi-ceph.sh @@ -57,7 +57,7 @@ fi echo "setup Docker registry image pull secrets exit" echo "Doing operator-openshift.yaml" -cat $rootPath/operator-openshift.yaml | sed 's#image: rook/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/rook/ceph#' | kubectl apply -f - +cat $rookPath/operator-openshift.yaml | sed 's#image: rook/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/rook/ceph#' | kubectl apply -f - oc create -f /tmp/operator-openshift.yaml echo "operator-openshift.yaml exit $?" sleep_count=30 @@ -79,7 +79,7 @@ echo "Doing sed of deviceFilter" sed -i 's/#deviceFilter:/deviceFilter: ^vd[b-z]$/g' $rookPath/cluster.yaml echo "Exit from deviceFilter $?" echo "Doing cluster.yaml create" -cat $rootPath/cluster.yaml | sed 's#image: ceph/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/ceph/ceph#' | kubectl apply -f - +cat $rookPath/cluster.yaml | sed 's#image: ceph/ceph#image: docker-na-public.artifactory.swg-devops.com/sec-guardium-next-gen-dockerhub-docker-remote/ceph/ceph#' | kubectl apply -f - oc create -f /tmp/cluster.yaml echo "Exit from cluster.yaml $?"