Skip to content

Commit

Permalink
Merge pull request #135 from tapis-project/main
Browse files Browse the repository at this point in the history
backport main versions
  • Loading branch information
mpackard authored Mar 22, 2023
2 parents 554ed40 + fd534be commit 0289ad1
Show file tree
Hide file tree
Showing 21 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions playbooks/roles/actors/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
actors_core_image: abaco/core-v3:{{ actors_service_version }}
actors_grafana_image: grafana/grafana
actors_prometheus_image: abaco/promv3:1.2.0
actors_prometheus_image: abaco/promv3:1.3.0
actors_nginx_image: abaco/nginx:latest
actors_nginxk8s_image: abaco/nginxk8s:1.2.0
actors_nginxk8s_image: abaco/nginxk8s:1.3.0
actors_mongo_image: mongo:4.2.6
actors_alpine_image: alpine:latest
actors_mongobackup_image: tapis/mongobackup:0.1
Expand Down
2 changes: 1 addition & 1 deletion playbooks/roles/actors/defaults/main/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ actors_service_url: '{{ global_service_url }}'
actors_service_tenant_id: admin
actors_service_site_id: '{{ global_site_id }}'
actors_service_name: actors
actors_service_version: 1.2.1
actors_service_version: 1.3.0
actors_storage_class: '{{ global_storage_class }}'
actors_rabbit_pvc: actors-rabbitmq-vol01
actors_mongo_pvc: actors-mongo-vol01
Expand Down
6 changes: 3 additions & 3 deletions playbooks/roles/admin/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
admin_util_image: tapis/ubutil2204:1.2.0
admin_centosutil_image: tapis/centosutil:1.2.0
admin_skadminutil_image: tapis/skadminutil:1.2.0
admin_util_image: tapis/ubutil2204:1.3.0
admin_centosutil_image: tapis/centosutil:1.3.0
admin_skadminutil_image: tapis/skadminutil:1.3.0
2 changes: 1 addition & 1 deletion playbooks/roles/apps/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
apps_api_image: tapis/apps:1.2.5
apps_api_image: tapis/apps:1.3.0
apps_postgres_image: postgres:12.4
apps_pgadmin_image: dpage/pgadmin4:6.20
4 changes: 2 additions & 2 deletions playbooks/roles/authenticator/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
authenticator_api_image: tapis/authenticator:1.2.5
authenticator_migrations_image: tapis/authenticator-migrations:1.2.5
authenticator_api_image: tapis/authenticator:1.3.0
authenticator_migrations_image: tapis/authenticator-migrations:1.3.0
authenticator_postgres_image: postgres:11.4
authenticator_ldap_image: tacc/slapd
4 changes: 2 additions & 2 deletions playbooks/roles/files/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
files_api_image: tapis/tapis-files:1.2.8
files_workers_image: tapis/tapis-files-workers:1.2.8
files_api_image: tapis/tapis-files:1.3.0
files_workers_image: tapis/tapis-files-workers:1.3.0
files_postgres_image: postgres:11
files_minio_image: minio/minio
files_irods_provider_postgres_image: mjstealey/irods-provider-postgres:4.2.4
Expand Down
2 changes: 1 addition & 1 deletion playbooks/roles/globus-proxy/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
globus_proxy_api_image: tapis/globus-proxy:1.2.0
globus_proxy_api_image: tapis/globus-proxy:1.3.0
6 changes: 3 additions & 3 deletions playbooks/roles/jobs/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
jobs_api_image: tapis/jobsapi:1.2.3
jobs_migrations_image: tapis/jobsmigrate:1.2.3
jobs_worker_image: tapis/jobsworker:1.2.3
jobs_api_image: tapis/jobsapi:1.3.0
jobs_migrations_image: tapis/jobsmigrate:1.3.0
jobs_worker_image: tapis/jobsworker:1.3.0
jobs_postgres_image: postgres:12.4
jobs_pgadmin_image: dpage/pgadmin4:6.20
jobs_rabbitmq_management_image: rabbitmq:3.8.11-management
6 changes: 3 additions & 3 deletions playbooks/roles/meta/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
meta_api_image: tapis/metaapi:1.2.0
meta_rh_server_image: tapis/tapis-meta-rh-server:1.2.0
meta_api_image: tapis/metaapi:1.3.0
meta_rh_server_image: tapis/tapis-meta-rh-server:1.3.0
meta_mongo_exporter_image: tapis/mqe:0.1
meta_mongo_singlenode_image: tapis/mongo-singlenode:4.4.6-bionic
meta_mongodb_backup_image: tapis/mongodb-backup:latest
meta_mongobackup_image: tapis/mongobackup:1.2.0
meta_mongobackup_image: tapis/mongobackup:1.3.0
meta_alpine_image: alpine:latest
2 changes: 1 addition & 1 deletion playbooks/roles/monitoring/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
monitoring_stern_fluentd_image: tapis/stern-fluentd:1.2.0
monitoring_stern_fluentd_image: tapis/stern-fluentd:1.3.0
monitoring_tapis_exporter_image: tapis/exporter:latest
monitoring_alpine_image: alpine:3.6
monitoring_postgres_image: bitnami/postgresql:14
Expand Down
4 changes: 2 additions & 2 deletions playbooks/roles/notifications/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
notifications_postgres_image: postgres:12.4
notifications_pgadmin_image: dpage/pgadmin4:6.20
notifications_rabbitmq_image: rabbitmq:3.8.11-management
notifications_api_image: tapis/notifications:1.2.0
notifications_dispatcher_image: tapis/notifications-dispatcher:1.2.0
notifications_api_image: tapis/notifications:1.3.0
notifications_dispatcher_image: tapis/notifications-dispatcher:1.3.0
2 changes: 1 addition & 1 deletion playbooks/roles/pgrest/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pgrest_api_image: tapis/pgrest-api:1.2.2
pgrest_api_image: tapis/pgrest-api:1.3.0
pgrest_postgres_image: postgres:13
2 changes: 1 addition & 1 deletion playbooks/roles/pods/defaults/main/vars.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

pods_service_name: pods
pods_image_version: 1.2.2
pods_image_version: 1.3.0
pods_service_site_id: "{{ global_site_id }}"
pods_service_tenant_id: admin
pods_primary_site_admin_tenant_base_url: "{{ global_primary_site_admin_tenant_base_url }}"
Expand Down
8 changes: 4 additions & 4 deletions playbooks/roles/security/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
security_pgadmin_image: dpage/pgadmin4:6.20
security_skadminutil_image: tapis/skadminutil:1.2.0
security_skadminutil_image: tapis/skadminutil:1.3.0
security_postgres_image: postgres:12.4
security_api_image: tapis/securityapi:1.2.3
security_migrations_image: tapis/securitymigrate:1.2.3
security_util_image: tapis/ubutil:1.2.0
security_api_image: tapis/securityapi:1.3.0
security_migrations_image: tapis/securitymigrate:1.3.0
security_util_image: tapis/ubutil:1.3.0
8 changes: 4 additions & 4 deletions playbooks/roles/skadmin/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
skadmin_securityexport_image: tapis/securityexport:1.2.3
skadmin_skadminutil_image: tapis/skadminutil:1.2.0
skadmin_securityadmin_image: tapis/securityadmin:1.2.1
skadmin_util_image: tapis/ubutil:1.2.0
skadmin_securityexport_image: tapis/securityexport:1.3.0
skadmin_skadminutil_image: tapis/skadminutil:1.3.0
skadmin_securityadmin_image: tapis/securityadmin:1.3.0
skadmin_util_image: tapis/ubutil:1.3.0
2 changes: 1 addition & 1 deletion playbooks/roles/streams/defaults/main/images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ streams_influxdb2_image: influxdb:2.1.1-alpine
streams_mysql_image: mysql:5.7
streams_chords_image: ncareol/chords:1.0
streams_tapis_chords_app_image: scleveland/tapis-chords-app:0.9.8.2.3
streams_api_image: tapis/streams-api:1.2.0
streams_api_image: tapis/streams-api:1.3.0
2 changes: 1 addition & 1 deletion playbooks/roles/systems/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
systems_pgadmin_image: dpage/pgadmin4:6.20
systems_postgres_image: postgres:12.4
systems_api_image: tapis/systems:1.2.8
systems_api_image: tapis/systems:1.3.0
2 changes: 1 addition & 1 deletion playbooks/roles/tapisui/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tapisui_image: tapis/tapisui:1.2.3
tapisui_image: tapis/tapisui:1.3.0
6 changes: 3 additions & 3 deletions playbooks/roles/tenants/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tenants_pgadmin_image: dpage/pgadmin4:6.20
tenants_postgres_image: postgres:11.4
tenants_api_image: tapis/tenants-api:1.2.0
tenants_migrations_image: tapis/tenants-api-migrations:1.2.0
tenants_api_tests_image: tapis/tenants-api-tests:1.2.0
tenants_api_image: tapis/tenants-api:1.3.0
tenants_migrations_image: tapis/tenants-api-migrations:1.3.0
tenants_api_tests_image: tapis/tenants-api-tests:1.3.0
4 changes: 2 additions & 2 deletions playbooks/roles/tokens/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tokens_api_image: tapis/tokens-api:1.2.3
tokens_api_tests_image: tapis/tokens-api-tests:1.2.3
tokens_api_image: tapis/tokens-api:1.3.0
tokens_api_tests_image: tapis/tokens-api-tests:1.3.0
tokens_add_token_roles_image: tapis/add_token_roles:latest
6 changes: 3 additions & 3 deletions playbooks/roles/workflows/defaults/main/images.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
workflows_api_image: tapis/workflows-api:1.2.0
workflows_pipelines_image: tapis/workflows-pipelines:1.2.0
workflows_engine_streams_image: tapis/workflow-engine-streams:1.2.0
workflows_api_image: tapis/workflows-api:1.3.0
workflows_pipelines_image: tapis/workflows-pipelines:1.3.0
workflows_engine_streams_image: tapis/workflow-engine-streams:1.3.0
workflows_mysql_image: mysql:8
workflows_rabbitmq_image: rabbitmq:3.9.11-management
workflows_registry_image: registry:2
Expand Down

0 comments on commit 0289ad1

Please sign in to comment.