diff --git a/Makefile b/Makefile index 22015e41..c4b26ce0 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: install_infra install_strimzi twitter_app +all: install_infra install_strimzi install_infra: ansible-playbook install/tealc-play.yaml --tags=infra @@ -9,4 +9,4 @@ install_strimzi: remove_infra: ansible-playbook install/tealc-play.yaml --tags=teardown -.PHONY: install_infra install_strimzi twitter_app remove_infra +.PHONY: install_infra install_strimzi remove_infra diff --git a/README.md b/README.md index 557ca982..c40f784f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ ansible-playbook tealc-play.yaml --tags=infra,strimzi-infra makefile ``` ansible-galaxy collection install -r install/collections/requirements.yml -make install_infra install_strimzi twitter_app +make install_infra install_strimzi ``` ansible-navigator diff --git a/install/examples/clusters.yaml b/install/examples/clusters.yaml index 96de173f..bf79fe8d 100644 --- a/install/examples/clusters.yaml +++ b/install/examples/clusters.yaml @@ -10,7 +10,6 @@ infra_token: zdepa kubeconfig_path: configpath github_secret_path: configpath/install/examples/github-secret.yaml grafana_docker_secret_path: configpath/install/examples/docker-secret.yaml -twitter_secret_path: configpath/install/examples/twitter # Workers workers: diff --git a/install/roles/tealc/defaults/main.yml b/install/roles/tealc/defaults/main.yml index a836b385..d3c4411b 100644 --- a/install/roles/tealc/defaults/main.yml +++ b/install/roles/tealc/defaults/main.yml @@ -6,7 +6,6 @@ infra_argo_namespace: tealc-gitops openshift_pipelines_namespace: openshift-pipelines openshift_operators_namespace: openshift-operators -strimzi_twitter_connector_namespace: strimzi-kafka route: empty access_token: empty diff --git a/install/roles/tealc/tasks/common/check_parameters.yaml b/install/roles/tealc/tasks/common/check_parameters.yaml index 603b5d1f..8d3f6b87 100644 --- a/install/roles/tealc/tasks/common/check_parameters.yaml +++ b/install/roles/tealc/tasks/common/check_parameters.yaml @@ -4,11 +4,6 @@ msg: "Variable 'github_secret_path' is not defined" when: github_secret_path is not defined -- name: Check that 'twitter_secret_path' is not defined - fail: - msg: "Variable 'twitter_secret_path' is not defined" - when: twitter_secret_path is not defined - - name: Check that 'workers' is not defined fail: msg: "Variable 'workers' is not defined" @@ -27,4 +22,4 @@ - name: Check that 'grafana_docker_secret_path' is not defined fail: msg: "Variable 'grafana_docker_secret_path' is not defined" - when: grafana_docker_secret_path is not defined \ No newline at end of file + when: grafana_docker_secret_path is not defined diff --git a/install/roles/tealc/tasks/infra-setup/prepare_access.yaml b/install/roles/tealc/tasks/infra-setup/prepare_access.yaml index 4a90f644..e9d038ec 100644 --- a/install/roles/tealc/tasks/infra-setup/prepare_access.yaml +++ b/install/roles/tealc/tasks/infra-setup/prepare_access.yaml @@ -92,3 +92,12 @@ template: templates/cluster-secret.yaml.j2 verify_ssl: no apply: true + +- name: Create Quay access secret + kubernetes.core.k8s: + kubeconfig: "{{ kubeconfig_path }}/{{ worker.value.name }}" + namespace: "default" + state: present + verify_ssl: no + apply: true + src: "{{ quay_io_secret_path }}" diff --git a/install/secrets/clusters.yaml b/install/secrets/clusters.yaml index 9240dd28..22f8b969 100644 Binary files a/install/secrets/clusters.yaml and b/install/secrets/clusters.yaml differ diff --git a/install/secrets/twitter/registry.yaml b/install/secrets/quay-io.yaml similarity index 100% rename from install/secrets/twitter/registry.yaml rename to install/secrets/quay-io.yaml diff --git a/install/secrets/twitter/twitter.yaml b/install/secrets/twitter/twitter.yaml deleted file mode 100644 index b57a97b3..00000000 Binary files a/install/secrets/twitter/twitter.yaml and /dev/null differ