From 2ab0c6c2636f303181886d1c50bb79d7fc8a363d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 14 May 2022 15:00:42 +0200 Subject: [PATCH] All overriding any image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also replaces all latest tags if possible (only ceph/daemon and cachethq/docker is latest now) Signed-off-by: Cédric Ollivier --- defaults/main.yml | 35 +++++++++++++++++++++++++++++++---- tasks/cachet.yml | 4 ++-- tasks/elasticsearch.yml | 6 +++--- tasks/fluentd.yml | 2 +- tasks/gitea.yml | 2 +- tasks/grafana.yml | 2 +- tasks/jenkins.yml | 4 ++-- tasks/kibana.yml | 6 +++--- tasks/minio.yml | 2 +- tasks/nexus.yml | 2 +- tasks/radosgw.yml | 2 +- tasks/registry.yml | 2 +- tasks/testapi.yml | 2 +- tasks/vault.yml | 2 +- 14 files changed, 50 insertions(+), 23 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c9f88c8..c580d0e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -70,21 +70,24 @@ docker_recreate: false docker_restart_policy: always jenkins_docker_image: opnfv/xtesting-jenkins jenkins_docker_tag: lts-slim -jenkins_k8s_docker_image: jenkins/jenkins -jenkins_k8s_docker_tag: lts-slim +jenkins_k8s_image: jenkins/jenkins +jenkins_k8s_tag: lts-slim jenkins_agent_docker_image: opnfv/xtesting-jenkins-agent jenkins_agent_docker_tag: 3.36-buster jenkins_agent_auto_docker_image: opnfv/xtesting-jenkins-agent-auto jenkins_agent_auto_docker_tag: 3.36-buster gitlab_docker_image: gitlab/gitlab-ce gitlab_docker_tag: 13.12.3-ce.0 +nexus_docker_image: sonatype/nexus3 nexus_docker_tag: 3.30.0 influxdb_docker_image: influxdb influxdb_docker_tag: 2.0.6-alpine minio_docker_image: minio/minio minio_docker_tag: RELEASE.2021-09-03T03-56-13Z -minio_s3www_image: opnfv/xtesting-s3www -minio_s3www_tag: v0.5.3 +minio_s3www_docker_image: opnfv/xtesting-s3www +minio_s3www_docker_tag: v0.5.3 +radosgw_docker_image: ceph/daemon +radosgw_docker_tag: latest mongo_docker_image: mongo mongo_docker_tag: 4.4 mongo_k8s_image: bitnami/mongodb @@ -93,6 +96,30 @@ postgres_docker_image: postgres postgres_docker_tag: 13-alpine postgres_k8s_image: bitnami/postgresql postgres_k8s_tag: 13.5.0 +cachet_docker_image: cachethq/docker +cachet_docker_tag: latest +cachet_url_monitor_docker_image: mtakaki/cachet-url-monitor +cachet_url_monitor_docker_tag: release-0.6.10 +elasticsearch_docker_image: docker.elastic.co/elasticsearch/elasticsearch-oss +elasticsearch_docker_tag: 7.10.2 +elasticsearch_k8s_image: "{{ elasticsearch_docker_image }}" +elasticsearch_k8s_tag: "{{ elasticsearch_docker_tag }}" +kibana_docker_image: docker.elastic.co/kibana/kibana-oss +kibana_docker_tag: 7.9.3 +kibana_k8s_image: "{{ kibana_docker_image }}" +kibana_k8s_tag: "{{ kibana_docker_tag }}" +fluentd_docker_image: fluent/fluentd +fluentd_docker_tag: v1.11-1 +gitea_docker_image: gitea/gitea +gitea_docker_tag: 1.13.2 +grafana_docker_image: grafana/grafana +grafana_docker_tag: 8.5.2 +registry_docker_image: registry +registry_docker_tag: 2 +testapi_docker_image: opnfv/testapi +testapi_docker_tag: kali +vault_docker_image: vault +vault_docker_tag: 1.10.3 # jenkins jenkins_deploy: true diff --git a/tasks/cachet.yml b/tasks/cachet.yml index 9d1ac46..8666f2f 100644 --- a/tasks/cachet.yml +++ b/tasks/cachet.yml @@ -3,7 +3,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: cachet - image: cachethq/docker:latest + image: '{{ cachet_docker_image }}:{{ cachet_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' @@ -179,7 +179,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: cachet-url-monitor - image: mtakaki/cachet-url-monitor + image: '{{ cachet_url_monitor_docker_image }}:{{ cachet_url_monitor_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/elasticsearch.yml b/tasks/elasticsearch.yml index 13af680..a96ad7b 100644 --- a/tasks/elasticsearch.yml +++ b/tasks/elasticsearch.yml @@ -12,7 +12,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: elasticsearch - image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2 + image: '{{ elasticsearch_docker_image }}:{{ elasticsearch_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' @@ -42,8 +42,8 @@ chart_version: 7.10.2 release_namespace: default values: - image: docker.elastic.co/elasticsearch/elasticsearch-oss - imageTag: 7.10.2 + image: '{{ elasticsearch_k8s_image }}' + imageTag: '{{ elasticsearch_k8s_tag }}' replicas: 1 volumeClaimTemplate: storageClassName: standard diff --git a/tasks/fluentd.yml b/tasks/fluentd.yml index a45a481..b44084d 100644 --- a/tasks/fluentd.yml +++ b/tasks/fluentd.yml @@ -11,7 +11,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: fluentd - image: fluent/fluentd:v1.11-1 + image: '{{ fluentd_docker_image }}:{{ fluentd_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/gitea.yml b/tasks/gitea.yml index 2ca245d..68d3552 100644 --- a/tasks/gitea.yml +++ b/tasks/gitea.yml @@ -3,7 +3,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: gitea - image: gitea/gitea:1.13.2 + image: '{{ gitea_docker_image }}:{{ gitea_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/grafana.yml b/tasks/grafana.yml index 26eeb30..b90e5b8 100644 --- a/tasks/grafana.yml +++ b/tasks/grafana.yml @@ -12,7 +12,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: grafana - image: grafana/grafana + image: '{{ grafana_docker_image }}:{{ grafana_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/jenkins.yml b/tasks/jenkins.yml index d793e57..1831115 100644 --- a/tasks/jenkins.yml +++ b/tasks/jenkins.yml @@ -81,8 +81,8 @@ release_namespace: default values: controller: - image: '{{ jenkins_k8s_docker_image }}' - tag: '{{ jenkins_k8s_docker_tag }}' + image: '{{ jenkins_k8s_image }}' + tag: '{{ jenkins_k8s_tag }}' adminUser: '{{ jenkins_user }}' adminPassword: '{{ jenkins_password }}' jenkinsUrl: '{{ jenkins_url }}' diff --git a/tasks/kibana.yml b/tasks/kibana.yml index 9321f1c..738a9ae 100644 --- a/tasks/kibana.yml +++ b/tasks/kibana.yml @@ -3,7 +3,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: kibana - image: docker.elastic.co/kibana/kibana-oss:7.9.3 + image: '{{ kibana_docker_image:kibana_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' @@ -30,8 +30,8 @@ chart_ref: elastic/kibana release_namespace: default values: - image: docker.elastic.co/kibana/kibana-oss - imageTag: 7.9.3 + image: '{{ kibana_k8s_image }}' + imageTag: '{{ kibana_k8s_tag }}' elasticsearchHosts: '{{ elasticsearch_url }}' service: type: NodePort diff --git a/tasks/minio.yml b/tasks/minio.yml index e8a2fa7..c240ca4 100644 --- a/tasks/minio.yml +++ b/tasks/minio.yml @@ -48,7 +48,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: s3www - image: '{{ minio_s3www_image }}:{{ minio_s3www_tag }}' + image: '{{ minio_s3www_docker_image }}:{{ minio_s3www_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/nexus.yml b/tasks/nexus.yml index 595de34..12833bf 100644 --- a/tasks/nexus.yml +++ b/tasks/nexus.yml @@ -11,7 +11,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: influxdb - image: sonatype/nexus3:{{ nexus_docker_tag }} + image: '{{ nexus_docker_image }}:{{ nexus_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/radosgw.yml b/tasks/radosgw.yml index 3fa87d1..6c9c511 100644 --- a/tasks/radosgw.yml +++ b/tasks/radosgw.yml @@ -3,7 +3,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: radosgw - image: ceph/daemon + image: '{{ radosgw_docker_image }}:{{ radosgw_docker_tag }}' pull: '{{ docker_pull }}' # demo doesn't support restart # https://github.com/ceph/ceph-container/issues/1475 diff --git a/tasks/registry.yml b/tasks/registry.yml index fd97ae4..0835e70 100644 --- a/tasks/registry.yml +++ b/tasks/registry.yml @@ -3,7 +3,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: registry - image: registry:2 + image: '{{ registry_docker_image:registry_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/testapi.yml b/tasks/testapi.yml index 1e7148e..122250d 100644 --- a/tasks/testapi.yml +++ b/tasks/testapi.yml @@ -3,7 +3,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: testapi - image: opnfv/testapi + image: '{{ testapi_docker_image }}:{{ testapi_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}' diff --git a/tasks/vault.yml b/tasks/vault.yml index 3130210..2ded57e 100644 --- a/tasks/vault.yml +++ b/tasks/vault.yml @@ -3,7 +3,7 @@ become: "{{ ansible_connection is defined }}" community.docker.docker_container: name: vault - image: vault + image: '{{ vault_docker_image }}:{{ vault_docker_tag }}' pull: '{{ docker_pull }}' recreate: '{{ docker_recreate }}' restart_policy: '{{ docker_restart_policy }}'