Skip to content

Commit

Permalink
All overriding any image
Browse files Browse the repository at this point in the history 
It also replaces all latest tags if possible
(only ceph/daemon and cachethq/docker is latest now)

Signed-off-by: Cédric Ollivier <[email protected]>
  • Loading branch information
@collivier
collivier committed May 14, 2022
1 parent 3d671ba commit 2ab0c6c
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 23 deletions.
35 changes: 31 additions & 4 deletions defaults/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tasks/cachet.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down Expand Up @@ -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 }}'
Expand Down
6 changes: 3 additions & 3 deletions tasks/elasticsearch.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tasks/fluentd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
2 changes: 1 addition & 1 deletion tasks/gitea.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
2 changes: 1 addition & 1 deletion tasks/grafana.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
4 changes: 2 additions & 2 deletions tasks/jenkins.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
6 changes: 3 additions & 3 deletions tasks/kibana.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tasks/minio.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
2 changes: 1 addition & 1 deletion tasks/nexus.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
2 changes: 1 addition & 1 deletion tasks/radosgw.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tasks/registry.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
2 changes: 1 addition & 1 deletion tasks/testapi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
2 changes: 1 addition & 1 deletion tasks/vault.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down

0 comments on commit 2ab0c6c

Please sign in to comment.