From bbe7345d7c8ef3315ad52f23ec13c8c3d8276bfb Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Mon, 7 Aug 2023 13:56:59 +0200 Subject: [PATCH] Remove twitter app is it is no longer supported (#238) Signed-off-by: Jakub Stejskal --- Makefile | 5 +-- README.md | 2 +- install/ansible-navigator.yml | 2 +- install/roles/tealc/tasks/main.yml | 3 -- .../argo-deploy-strimzi-twitter-app.yaml | 15 ------- .../twitter/prepare_access_twitter.yaml | 23 ---------- .../applications/strimzi-twitter-app.yaml | 44 ------------------- .../tekton/pipelines/infra/tealc-install.yaml | 2 +- 8 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 install/roles/tealc/tasks/scenario-deployment/twitter/argo-deploy-strimzi-twitter-app.yaml delete mode 100644 install/roles/tealc/tasks/scenario-deployment/twitter/prepare_access_twitter.yaml delete mode 100644 install/roles/tealc/templates/argo/applications/strimzi-twitter-app.yaml diff --git a/Makefile b/Makefile index 69933cd9..22015e41 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,7 @@ install_infra: install_strimzi: ansible-playbook install/tealc-play.yaml --tags=strimzi-infra -twitter_app: - ansible-playbook install/tealc-play.yaml --tags=twitter-app - remove_infra: ansible-playbook install/tealc-play.yaml --tags=teardown -.PHONY: install_infra install_strimzi twitter_app remove_infra \ No newline at end of file +.PHONY: install_infra install_strimzi twitter_app remove_infra diff --git a/README.md b/README.md index 37eeaf36..557ca982 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ansible-playbook ``` cd install ansible-galaxy collection install -r collections/requirements.yml -ansible-playbook tealc-play.yaml --tags=infra,strimzi-infra,twitter-app +ansible-playbook tealc-play.yaml --tags=infra,strimzi-infra ``` makefile diff --git a/install/ansible-navigator.yml b/install/ansible-navigator.yml index 1b03ab3b..0b49f28e 100644 --- a/install/ansible-navigator.yml +++ b/install/ansible-navigator.yml @@ -11,7 +11,7 @@ ansible-navigator: - "--platform linux/amd64" environment-variables: set: - ANSIBLE_RUN_TAGS: 'infra,strimzi-infra,twitter-app' + ANSIBLE_RUN_TAGS: 'infra,strimzi-infra' app: run mode: stdout diff --git a/install/roles/tealc/tasks/main.yml b/install/roles/tealc/tasks/main.yml index 9f4e2ce6..7377ed4b 100644 --- a/install/roles/tealc/tasks/main.yml +++ b/install/roles/tealc/tasks/main.yml @@ -70,9 +70,6 @@ - import_tasks: scenario-deployment/monitoring/argo-deploy-strimzi-monitoring.yaml tags: [argo-apps, argo-strimzi-monitoring, strimzi-infra, never] -- import_tasks: scenario-deployment/twitter/argo-deploy-strimzi-twitter-app.yaml - tags: [argo-apps, argo-strimzi-twitter-app, twitter-app, never] - - import_tasks: scenario-deployment/tekton/strimzi-infra-tkn-pipelines.yaml tags: [tekton-pipelines, strimzi-infra, never] diff --git a/install/roles/tealc/tasks/scenario-deployment/twitter/argo-deploy-strimzi-twitter-app.yaml b/install/roles/tealc/tasks/scenario-deployment/twitter/argo-deploy-strimzi-twitter-app.yaml deleted file mode 100644 index c5674357..00000000 --- a/install/roles/tealc/tasks/scenario-deployment/twitter/argo-deploy-strimzi-twitter-app.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- include_tasks: prepare_access_twitter.yaml - loop: - - "{{ workers.main_cluster }}" - loop_control: - loop_var: worker - -- name: Create Argo applications for Strimzi twitter - kubernetes.core.k8s: - kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}" - namespace: "{{ infra_argo_namespace }}" - state: present - verify_ssl: no - apply: true - src: "templates/argo/applications/strimzi-twitter-app.yaml" diff --git a/install/roles/tealc/tasks/scenario-deployment/twitter/prepare_access_twitter.yaml b/install/roles/tealc/tasks/scenario-deployment/twitter/prepare_access_twitter.yaml deleted file mode 100644 index 0e49fe82..00000000 --- a/install/roles/tealc/tasks/scenario-deployment/twitter/prepare_access_twitter.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: Create Connector namespace on Worker cluster - kubernetes.core.k8s: - kubeconfig: "{{ kubeconfig_path }}/{{ worker.name }}" - name: "{{ item }}" - api_version: v1 - kind: Namespace - state: present - verify_ssl: no - loop: - - "{{ strimzi_twitter_connector_namespace }}" - -- name: Create Twitter access secret - kubernetes.core.k8s: - kubeconfig: "{{ kubeconfig_path }}/{{ worker.name }}" - namespace: "{{ strimzi_twitter_connector_namespace }}" - state: present - verify_ssl: no - apply: true - src: "{{ twitter_secret_path }}/{{ item }}" - loop: - - "registry.yaml" - - "twitter.yaml" \ No newline at end of file diff --git a/install/roles/tealc/templates/argo/applications/strimzi-twitter-app.yaml b/install/roles/tealc/templates/argo/applications/strimzi-twitter-app.yaml deleted file mode 100644 index 2aa11753..00000000 --- a/install/roles/tealc/templates/argo/applications/strimzi-twitter-app.yaml +++ /dev/null @@ -1,44 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: strimzi-twitter-app -spec: - generators: - - matrix: - generators: - - git: - repoURL: https://github.com/ExcelentProject/sokar - revision: HEAD - files: - - path: 'twitter-connector/**/argo-config.yaml' - - clusters: - selector: - matchLabels: - environment: 'upstream-latest' - template: - metadata: - name: '{{appname}}-{{name}}' - labels: - project: tealc - app: strimzi - spec: - project: default - source: - repoURL: https://github.com/ExcelentProject/sokar - targetRevision: HEAD - path: '{{source}}' - directory: - recurse: true - exclude: '{argo-config.yaml}' - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: - project: tealc - destination: - name: '{{name}}' - namespace: '{{namespace}}' diff --git a/install/roles/tealc/templates/tekton/pipelines/infra/tealc-install.yaml b/install/roles/tealc/templates/tekton/pipelines/infra/tealc-install.yaml index 24677116..f2f29672 100644 --- a/install/roles/tealc/templates/tekton/pipelines/infra/tealc-install.yaml +++ b/install/roles/tealc/templates/tekton/pipelines/infra/tealc-install.yaml @@ -31,7 +31,7 @@ spec: git clone https://github.com/ExcelentProject/tealc.git $CURRENT_DIR echo $GIT_CRYPT_SECRET | base64 -d > "$CURRENT_DIR/crypt-key" cd $CURRENT_DIR && git crypt unlock crypt-key - cd $CURRENT_DIR && ansible-playbook install/tealc-play.yaml --tags="infra,strimzi-infra,twitter-app" + cd $CURRENT_DIR && ansible-playbook install/tealc-play.yaml --tags="infra,strimzi-infra" finally: - name: notify-slack when: