Merge pull request #370 from tapis-project/staging

Staging
tapis-project · May 21, 2024 · fb79ea1 · fb79ea1
2 parents 7730453 + b2e10b4
commit fb79ea1
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Changelog 
 
-Notable changes between versions.
+## 1.6.2
+
+### Service Updates
+
+- [Systems: 1.6.1 to 1.6.2 (tapis/systems)](https://github.com/tapis-project/tapis-systems/blob/1.6.2/CHANGELOG.md)
+- [Apps: 1.6.1 to 1.6.2 (tapis/apps)](https://github.com/tapis-project/tapis-apps/blob/1.6.2/CHANGELOG.md)
+- [Notifications: 1.6.1 to 1.6.2 (tapis/notifications, notifications-dispatcher)](https://github.com/tapis-project/tapis-notifications/blob/1.6.2/CHANGELOG.md)
+- [Files: 1.6.1 to 1.6.2 (tapis/tapis-files, tapis/tapis-files-workers)](https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md)
+- [Jobs: 1.6.1 to 1.6.2 (tapis/jobsworker, jobsmigrate, jobsapi)](https://github.com/tapis-project/tapis-jobs/blob/dev/tapis-jobsapi/CHANGELOG.md)
+- [Security: 1.6.1 to 1.6.2 (tapis/securitymigrate, securityadmin, securityapi, securityexport)](https://github.com/tapis-project/tapis-security/blob/dev/tapis-securityapi/CHANGELOG.md)
+- [Meta: 1.6.0 to 1.6.1 (tapis/metaapi, tapis-meta-rh-server)](https://github.com/tapis-project/tapis-meta/blob/dev/CHANGELOG.md)
+- [Authenticator: 1.6.0 to 1.6.1 (tapis/authenticator, tapis/authenticator-migrations)](https://github.com/tapis-project/authenticator/blob/staging/CHANGELOG.md#161---2024-05-21-estimated)
+
 
 ## 1.6.1 
 

diff --git a/playbooks/roles/apps/defaults/main/images.yml b/playbooks/roles/apps/defaults/main/images.yml
@@ -1,4 +1,4 @@
-apps_api_image: tapis/apps:1.6.1
+apps_api_image: tapis/apps:1.6.2
 apps_postgres_image: postgres:12.4
 apps_pgadmin_image: dpage/pgadmin4:6.20
 apps_util_image: tapis/ubutil2204:1.6.0
diff --git a/playbooks/roles/authenticator/defaults/main/images.yml b/playbooks/roles/authenticator/defaults/main/images.yml
@@ -1,4 +1,4 @@
-authenticator_api_image: tapis/authenticator:1.6.0
-authenticator_migrations_image: tapis/authenticator-migrations:1.6.0
+authenticator_api_image: tapis/authenticator:1.6.1
+authenticator_migrations_image: tapis/authenticator-migrations:1.6.1
 authenticator_postgres_image: postgres:11.4
 authenticator_ldap_image: tacc/slapd:1
diff --git a/playbooks/roles/baseburnup/defaults/main/vars.yml b/playbooks/roles/baseburnup/defaults/main/vars.yml
@@ -1,4 +1,4 @@
-baseburnup_tapis_deployer_version: 1.6.1
+baseburnup_tapis_deployer_version: 1.6.2
 baseburnup_service_url: "{{ global_service_url }}"
 baseburnup_vault_url: "{{ global_vault_url }}"
 
diff --git a/playbooks/roles/files/defaults/main/images.yml b/playbooks/roles/files/defaults/main/images.yml
@@ -1,5 +1,5 @@
-files_api_image: tapis/tapis-files:1.6.1
-files_workers_image: tapis/tapis-files-workers:1.6.1
+files_api_image: tapis/tapis-files:1.6.2
+files_workers_image: tapis/tapis-files-workers:1.6.2
 files_postgres_image: postgres:11
 files_migrations_image: postgres:11
 files_minio_image: minio/minio

diff --git a/playbooks/roles/jobs/defaults/main/images.yml b/playbooks/roles/jobs/defaults/main/images.yml
@@ -1,6 +1,6 @@
-jobs_api_image: tapis/jobsapi:1.6.1
-jobs_migrations_image: tapis/jobsmigrate:1.6.1
-jobs_worker_image: tapis/jobsworker:1.6.1
+jobs_api_image: tapis/jobsapi:1.6.2
+jobs_migrations_image: tapis/jobsmigrate:1.6.2
+jobs_worker_image: tapis/jobsworker:1.6.2
 jobs_postgres_image: postgres:12.4
 jobs_pgadmin_image: dpage/pgadmin4:6.20
 jobs_rabbitmq_management_image: rabbitmq:3.8.11-management

diff --git a/playbooks/roles/meta/defaults/main/images.yml b/playbooks/roles/meta/defaults/main/images.yml
@@ -1,5 +1,5 @@
-meta_api_image: tapis/metaapi:1.6.0
-meta_rh_server_image: tapis/tapis-meta-rh-server:1.6.0
+meta_api_image: tapis/metaapi:1.6.1
+meta_rh_server_image: tapis/tapis-meta-rh-server:1.6.1
 meta_mongo_exporter_image: tapis/mqe:1.6.0
 meta_mongo_singlenode_image: tapis/mongo-singlenode:1.6.0
 meta_mongodb_backup_image: tapis/mongodb-backup:1.6.0

diff --git a/playbooks/roles/notifications/defaults/main/images.yml b/playbooks/roles/notifications/defaults/main/images.yml
@@ -2,5 +2,5 @@ notifications_postgres_image: postgres:12.4
 notifications_pgadmin_image: dpage/pgadmin4:6.20
 notifications_rabbitmq_image: rabbitmq:3.8.11-management
 notifications_util_image: tapis/ubutil2204:1.6.0
-notifications_api_image: tapis/notifications:1.6.1
-notifications_dispatcher_image: tapis/notifications-dispatcher:1.6.1
+notifications_api_image: tapis/notifications:1.6.2
+notifications_dispatcher_image: tapis/notifications-dispatcher:1.6.2
diff --git a/playbooks/roles/proxy/templates/docker/locations/apps.conf b/playbooks/roles/proxy/templates/docker/locations/apps.conf
@@ -6,7 +6,7 @@ location /v3/apps
 
     resolver 127.0.0.11;
 
-    set $upstream {{ apps_host | default("http://apps-api:;")}}:{{ apps_port | default("8080")}};
+    set $upstream {{ apps_host | default("http://apps-api")}}:{{ apps_port | default("8080")}};
     proxy_pass $upstream;
 
     proxy_redirect off;

diff --git a/playbooks/roles/proxy/templates/docker/locations/files.conf b/playbooks/roles/proxy/templates/docker/locations/files.conf
@@ -6,7 +6,7 @@ location /v3/files
     error_page 500 /token-revoked.json; 
 
     resolver 127.0.0.11;
-    set $upstream {{ files_host | default("http://files-api:;")}}:{{ files_port | default("8080")}};
+    set $upstream {{ files_host | default("http://files-api")}}:{{ files_port | default("8080")}};
     proxy_pass $upstream;
 
     proxy_redirect off;

diff --git a/playbooks/roles/proxy/templates/docker/locations/jobs.conf b/playbooks/roles/proxy/templates/docker/locations/jobs.conf
@@ -5,7 +5,7 @@ location /v3/jobs
     error_page 500 /token-revoked.json; 
 
     resolver 127.0.0.11;
-    set $upstream {{ apps_host | default("http://jobs-api:;")}}:{{ jobs_port | default("8080")}};
+    set $upstream {{ jobs_host | default("http://jobs-api")}}:{{ jobs_port | default("8080")}};
 
     proxy_pass $upstream;
 

diff --git a/playbooks/roles/proxy/templates/docker/locations/systems.conf b/playbooks/roles/proxy/templates/docker/locations/systems.conf
@@ -6,7 +6,7 @@ location /v3/systems
     error_page 500 /token-revoked.json; 
 
     resolver 127.0.0.11;
-    set $upstream {{ systems_host | default("http://systems-api:;")}}:{{ systems_port | default("8080")}};
+    set $upstream {{ systems_host | default("http://systems-api")}}:{{ systems_port | default("8080")}};
     proxy_pass $upstream;
 
 

diff --git a/playbooks/roles/security/defaults/main/images.yml b/playbooks/roles/security/defaults/main/images.yml
@@ -1,6 +1,6 @@
 security_pgadmin_image: dpage/pgadmin4:6.20
-security_skadminutil_image: tapis/skadminutil:1.6.1
+security_skadminutil_image: tapis/skadminutil:1.6.2
 security_postgres_image: postgres:12.4
-security_api_image: tapis/securityapi:1.6.1
-security_migrations_image: tapis/securitymigrate:1.6.1
+security_api_image: tapis/securityapi:1.6.2
+security_migrations_image: tapis/securitymigrate:1.6.2
 security_util_image: tapis/ubutil:1.6.1
diff --git a/playbooks/roles/skadmin/defaults/main/images.yml b/playbooks/roles/skadmin/defaults/main/images.yml
@@ -1,4 +1,4 @@
-skadmin_securityexport_image: tapis/securityexport:1.6.1
-skadmin_skadminutil_image: tapis/skadminutil:1.6.1
-skadmin_securityadmin_image: tapis/securityadmin:1.6.1
+skadmin_securityexport_image: tapis/securityexport:1.6.2
+skadmin_skadminutil_image: tapis/skadminutil:1.6.2
+skadmin_securityadmin_image: tapis/securityadmin:1.6.2
 skadmin_util_image: tapis/ubutil:1.6.1
diff --git a/playbooks/roles/systems/defaults/main/images.yml b/playbooks/roles/systems/defaults/main/images.yml
@@ -1,4 +1,4 @@
 systems_pgadmin_image: dpage/pgadmin4:6.20
 systems_postgres_image: postgres:12.4
 systems_util_image: tapis/ubutil2204:1.6.1
-systems_api_image: tapis/systems:1.6.1
+systems_api_image: tapis/systems:1.6.2