Merge pull request #260 from tapis-project/dev

Dev
tapis-project · Jul 17, 2023 · fac910b · fac910b
2 parents da19522 + 38aece3
commit fac910b
Show file tree

Hide file tree

Showing 29 changed files with 67 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,30 +4,36 @@ Notable changes between versions.
 
 ## 1.4.0
 
-### Services updated:
-
+### Services Updated
+
+- All Tapis components will be updated from versions 1.3.x to 1.4.0.
+  - [Workflows](https://github.com/tapis-project/tapis-workflows/blob/release-1.4.0/CHANGELOG.md)
+  - [Pods](https://github.com/tapis-project/pods_service/blob/prod/CHANGELOG.md#140---2023-07-06)
+  - [Systems](https://github.com/tapis-project/tapis-systems/blob/1.4.0/CHANGELOG.md) 
+  - [Apps](https://github.com/tapis-project/tapis-apps/blob/local/CHANGELOG.md)
+  - [Files](https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md)
+  - [Jobs](https://github.com/tapis-project/tapis-jobs/blob/dev/tapis-jobsapi/CHANGELOG.md)
+  - [Authenticator](https://github.com/tapis-project/authenticator/blob/staging/CHANGELOG.md)
+  - [Meta](https://github.com/tapis-project/tapis-meta/blob/dev/CHANGELOG.md)
+  - [Tenants](https://github.com/tapis-project/tenants-api/blob/dev/CHANGELOG.md)
+  - [Tokens](https://github.com/tapis-project/tokens-api/blob/dev/CHANGELOG.md)
+  - [Notifications](https://github.com/tapis-project/tapis-notifications/blob/dev/CHANGELOG.md)
+  - [Globus-Proxy](https://github.com/tapis-project/globus-proxy/blob/dev/CHANGELOG.md)
+  - [Security](https://github.com/tapis-project/tapis-security/blob/dev/tapis-securityapi/CHANGELOG.md)
 - Nginx locations for individual components have been split into their own location files. Should not cause a breaking change or interrupt routing. 
-- [Systems: 1.3.3 to 1.4.0 (tapis/systems)](https://github.com/tapis-project/tapis-systems/blob/1.4.0/CHANGELOG.md) 
-- [Apps: 1.3.3 to 1.4.0 (tapis/apps)](https://github.com/tapis-project/tapis-apps/blob/1.4.0/CHANGELOG.md)  
-- [Notifications: 1.3.4 to 1.4.0 (tapis/notifications, notifications-dispatcher)](https://github.com/tapis-project/tapis-notifications/blob/1.4.0/CHANGELOG.md)  
-- [Files: 1.3.6 to 1.4.0 (tapis/tapis-files, tapis/tapis-files-workers)](https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md)
-- [Jobs: 1.3.5 to 1.4.0 (tapis/jobsworker, jobsmigrate, jobsapi)](https://github.com/tapis-project/tapis-jobs/blob/dev/tapis-jobsapi/CHANGELOG.md)
-- [Security: 1.3.2 to 1.4.0 (tapis/securitymigrate, securityadmin, securityapi, securityexport)](https://github.com/tapis-project/tapis-security/blob/dev/tapis-securityapi/CHANGELOG.md)
-- [Authenticator: 1.3.4 to 1.3.5 (authenticator_api_image, authenticator_migrations_image)](https://github.com/tapis-project/authenticator/blob/staging/CHANGELOG.md)
-- [Pods: 1.3.2 to 1.4.0 (tapis/pods-api)](https://github.com/tapis-project/pods_service/blob/prod/CHANGELOG.md#140---2023-07-06)
-
-### Breaking Changes for Services / Tapis Users 
-
-- For Systems and Apps: Environment variables beginning with *_tapis* are no longer valid in the envVariables attribute. (This matches existing Jobs service behavior.) If you are a Tapis user who creates or maintains Systems or Apps resources, creating a resource that specifies an environment variable starting with *_tapis* will now result in the resource creation to be rejected. If such a resource already exists, future jobs that use it will fail.
-- Authenticator: 
+
+### Breaking Changes for Services / Tapis Users
+
+- For Systems and Apps: Environment variables beginning with _tapis are no longer valid in the envVariables attribute. (This matches existing Jobs service behavior.) If you are a Tapis user who creates or maintains Systems or Apps resources, creating a resource that specifies an environment variable starting with _tapis will now result in the resource creation to be rejected. If such a resource already exists, future jobs that use it will fail.
+- Authenticator:
   - The DELETE /v3/oauth2/clients endpoint now returns the standard 5-stanza Tapis response. Previously, it returned an empty HTTP response. Applications that use this endpoint should be updated to handle a non-empty response.
   - The POST /v3/oauth2/tokens endpoint has been changed in the case of the device_code grant to require only the client_id as a POST parameter. Previously, the client_id and client_key were erroneously both required to be passed using an HTTP Basic Auth header. Client applications that utilized the device code grant type and passed the client credentials as part of the HTTP Basic Auth header must be updated to pass only the client id as part of the POST payload. The OA3 spec has been updated to reflect this new requirement. See issue #32.
 
-### Deployer updates:
+### Deployer Updates
 
-- None
+- Nginx locations for individual components have been split into their own location files. This should not cause a breaking change or interrupt routing.
 
-### Breaking Changes for Tapis Deployer Admins
+### Breaking Changes for Deployer Admins
 
 - None
 

diff --git a/playbooks/roles/actors/defaults/main/images.yml b/playbooks/roles/actors/defaults/main/images.yml
@@ -1,8 +1,8 @@
 actors_core_image: abaco/core-v3:{{ actors_service_version }}
 actors_grafana_image: grafana/grafana:9.4.7
-actors_prometheus_image: abaco/promv3:1.3.0
+actors_prometheus_image: abaco/promv3:1.4.0
 actors_nginx_image: abaco/nginx:1.9.1
-actors_nginxk8s_image: abaco/nginxk8s:1.3.0
+actors_nginxk8s_image: abaco/nginxk8s:1.4.0
 actors_mongo_image: mongo:4.2.6
 actors_alpine_image: alpine:3.17
 actors_mongobackup_image: tapis/mongobackup:0.1

diff --git a/playbooks/roles/actors/defaults/main/vars.yml b/playbooks/roles/actors/defaults/main/vars.yml
@@ -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.3.1
+actors_service_version: 1.4.0
 actors_storage_class: '{{ global_storage_class }}'
 actors_rabbit_pvc: actors-rabbitmq-vol01
 actors_mongo_pvc: actors-mongo-vol01

diff --git a/playbooks/roles/actors/templates/docker/burnup b/playbooks/roles/actors/templates/docker/burnup
@@ -4,8 +4,8 @@ echo "burnup actors:"
 
 mkdir -p {{ tapisdatadir }}/actors
 myuid=`id -u`
-docker run -it --rm -v {{ tapisdatadir }}/actors:/actors tapis/ubutil2204:1.3.0 chown $myuid /actors
+docker run -it --rm -v {{ tapisdatadir }}/actors:/actors tapis/ubutil2204:1.4.0 chown $myuid /actors
 
 python3 {{ tapisdir }}/admin/util/parse_skexport -c actors -d {{ tapisdatadir }}
 
-docker compose up -d
+docker compose up -d
diff --git a/playbooks/roles/admin/defaults/main/images.yml b/playbooks/roles/admin/defaults/main/images.yml
@@ -1,3 +1,3 @@
-admin_util_image: tapis/ubutil2204:1.3.0
-admin_centosutil_image: tapis/centosutil:1.3.0
-admin_skadminutil_image: tapis/skadminutil:1.3.0
+admin_util_image: tapis/ubutil2204:1.4.0
+admin_centosutil_image: tapis/centosutil:1.4.0
+admin_skadminutil_image: tapis/skadminutil:1.4.0
diff --git a/playbooks/roles/admin/templates/docker/verification/authenticator-test b/playbooks/roles/admin/templates/docker/verification/authenticator-test
@@ -6,4 +6,4 @@ curl -d '{"username": "testuser2", "password": "testuser2", "grant_type": "passw
 # should return 200 and JSON with token
 
 export pass=`grep ^LDAP_ROOTPASS {{ tapisdatadir }}/authenticator/env | awk -F= '{print $2}' | tr -d '"'`
-docker run --rm -it --network tapis tapis/centosutil:1.3.1 ldapsearch -x -H ldap://authenticator-ldap:389 -Z -D "cn=admin,dc=tapis" -w "$pass" -b "ou=tenants.dev,dc=tapis"
+docker run --rm -it --network tapis tapis/centosutil:1.4.0 ldapsearch -x -H ldap://authenticator-ldap:389 -Z -D "cn=admin,dc=tapis" -w "$pass" -b "ou=tenants.dev,dc=tapis"
diff --git a/playbooks/roles/apps/templates/docker/burnup b/playbooks/roles/apps/templates/docker/burnup
@@ -7,7 +7,7 @@ myuid=`id -u`
 export UID=`id -u`
 export GID=`id -g`
 
-docker run -it --rm -v {{ tapisdatadir }}/apps:/apps tapis/ubutil2204:1.3.0 chown $myuid /apps
+docker run -it --rm -v {{ tapisdatadir }}/apps:/apps tapis/ubutil2204:1.4.0 chown $myuid /apps
 
 python3 {{ tapisdir }}/admin/util/parse_skexport -c apps -d {{ tapisdatadir }}
 

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.3.5
-authenticator_migrations_image: tapis/authenticator-migrations:1.3.5
+authenticator_api_image: tapis/authenticator:1.4.0
+authenticator_migrations_image: tapis/authenticator-migrations:1.4.0
 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.3.9
+baseburnup_tapis_deployer_version: 1.4.0
 baseburnup_service_url: "{{ global_service_url }}"
 baseburnup_vault_url: "{{ global_vault_url }}"
 
diff --git a/playbooks/roles/files/templates/docker/burnup b/playbooks/roles/files/templates/docker/burnup
@@ -11,7 +11,7 @@ mkdir -p {{ tapisdatadir }}/files/irods
 myuid=`id -u`
 export UID=`id -u`
 export GID=`id -g`
-docker run -it --rm -v {{ tapisdatadir }}/files:/files tapis/ubutil2204:1.3.0 chown $myuid /files
+docker run -it --rm -v {{ tapisdatadir }}/files:/files tapis/ubutil2204:1.4.0 chown $myuid /files
 
 python3 {{ tapisdir }}/admin/util/parse_skexport -c files -d {{ tapisdatadir }}
 

diff --git a/playbooks/roles/globus-proxy/defaults/main/images.yml b/playbooks/roles/globus-proxy/defaults/main/images.yml
@@ -1 +1 @@
-globus_proxy_api_image: tapis/globus-proxy:1.3.1
+globus_proxy_api_image: tapis/globus-proxy:1.4.0
diff --git a/playbooks/roles/jobs/templates/docker/burnup b/playbooks/roles/jobs/templates/docker/burnup
@@ -7,7 +7,7 @@ mkdir -p {{ tapisdatadir }}/jobs
 # myuid=`id -u`
 export UID=`id -u`
 export GID=`id -g`
-docker run -it --rm -v {{ tapisdatadir }}/jobs:/jobs tapis/ubutil2204:1.3.0 chown $UID /jobs
+docker run -it --rm -v {{ tapisdatadir }}/jobs:/jobs tapis/ubutil2204:1.4.0 chown $UID /jobs
 
 python3 {{ tapisdir }}/admin/util/parse_skexport -c jobs -d {{ tapisdatadir }}
 

diff --git a/playbooks/roles/meta/defaults/main/images.yml b/playbooks/roles/meta/defaults/main/images.yml
@@ -1,7 +1,7 @@
-meta_api_image: tapis/metaapi:1.3.0
-meta_rh_server_image: tapis/tapis-meta-rh-server:1.3.0
+meta_api_image: tapis/metaapi:1.4.0
+meta_rh_server_image: tapis/tapis-meta-rh-server:1.4.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:1
-meta_mongobackup_image: tapis/mongobackup:1.3.0
+meta_mongobackup_image: tapis/mongobackup:1.4.0
 meta_alpine_image: alpine:3.17
diff --git a/playbooks/roles/monitoring/defaults/main/images.yml b/playbooks/roles/monitoring/defaults/main/images.yml
@@ -1,5 +1,5 @@
-monitoring_stern_fluentd_image: tapis/stern-fluentd:1.3.0
-monitoring_tapis_exporter_image: tapis/exporter:1.3.1
+monitoring_stern_fluentd_image: tapis/stern-fluentd:1.4.0
+monitoring_tapis_exporter_image: tapis/exporter:1.4.0
 monitoring_alpine_image: alpine:3.6
 monitoring_postgres_image: bitnami/postgresql:14
 monitoring_elasticsearch_image: docker.elastic.co/elasticsearch/elasticsearch:7.17.9

diff --git a/playbooks/roles/notifications/templates/docker/burnup b/playbooks/roles/notifications/templates/docker/burnup
@@ -6,8 +6,8 @@ mkdir -p {{ tapisdatadir }}/notifications
 myuid=`id -u`
 export UID=`id -u`
 export GID=`id -g`
-docker run -it --rm -v {{ tapisdatadir }}/notifications:/notifications tapis/ubutil2204:1.3.0 chown $myuid /notifications
+docker run -it --rm -v {{ tapisdatadir }}/notifications:/notifications tapis/ubutil2204:1.4.0 chown $myuid /notifications
 
 python3 {{ tapisdir }}/admin/util/parse_skexport -c notifications -d {{ tapisdatadir }}
 
-docker compose up -d
+docker compose up -d
diff --git a/playbooks/roles/pgrest/defaults/main/images.yml b/playbooks/roles/pgrest/defaults/main/images.yml
@@ -1,2 +1,2 @@
-pgrest_api_image: tapis/pgrest-api:1.3.0
+pgrest_api_image: tapis/pgrest-api:1.4.0
 pgrest_postgres_image: postgres:13
diff --git a/playbooks/roles/pods/defaults/main/vars.yml b/playbooks/roles/pods/defaults/main/vars.yml
@@ -1,7 +1,7 @@
 ---
 
 pods_service_name: pods
-pods_image_version: 1.3.1
+pods_image_version: 1.4.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 }}"

diff --git a/playbooks/roles/proxy/defaults/main/vars.yml b/playbooks/roles/proxy/defaults/main/vars.yml
@@ -6,7 +6,7 @@ proxy_service_site_id: "{{ global_site_id }}"
 proxy_service_name: proxy
 proxy_primary_site_admin_tenant_base_url: "{{ global_primary_site_admin_tenant_base_url }}"
 proxy_site_router_pvc: site-router-redis-vol01
-proxy_site_router_api_version: 1.3.0
+proxy_site_router_api_version: 1.4.0
 proxy_storage_class: "{{ global_storage_class }}"
 proxy_nginx_cert_file: $HOME/cert.pem
 proxy_nginx_cert_key: $HOME/cert.key

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.3.0
+security_skadminutil_image: tapis/skadminutil:1.4.0
 security_postgres_image: postgres:12.4
 security_api_image: tapis/securityapi:1.4.0
 security_migrations_image: tapis/securitymigrate:1.4.0
-security_util_image: tapis/ubutil:1.3.0
+security_util_image: tapis/ubutil:1.4.0
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.4.0
-skadmin_skadminutil_image: tapis/skadminutil:1.3.0
+skadmin_skadminutil_image: tapis/skadminutil:1.4.0
 skadmin_securityadmin_image: tapis/securityadmin:1.4.0
-skadmin_util_image: tapis/ubutil:1.3.0
+skadmin_util_image: tapis/ubutil:1.4.0
diff --git a/playbooks/roles/streams/defaults/main/images.yml b/playbooks/roles/streams/defaults/main/images.yml
@@ -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.3.0
+streams_api_image: tapis/streams-api:1.4.0
diff --git a/playbooks/roles/systems/templates/docker/burnup b/playbooks/roles/systems/templates/docker/burnup
@@ -4,7 +4,7 @@ echo "burnup systems:"
 
 mkdir -p {{ tapisdatadir }}/systems
 myuid=`id -u`
-docker run -it --rm -v {{ tapisdatadir }}/systems:/systems tapis/ubutil2204:1.3.0 chown $myuid /systems
+docker run -it --rm -v {{ tapisdatadir }}/systems:/systems tapis/ubutil2204:1.4.0 chown $myuid /systems
 
 export UID=`id -u`
 export GID=`id -g`

diff --git a/playbooks/roles/tapisui/defaults/main/images.yml b/playbooks/roles/tapisui/defaults/main/images.yml
@@ -1 +1 @@
-tapisui_image: tapis/tapisui:1.3.1
+tapisui_image: tapis/tapisui:1.4.0
diff --git a/playbooks/roles/tapisui/templates/docker/burnup b/playbooks/roles/tapisui/templates/docker/burnup
@@ -4,8 +4,8 @@ echo "burnup tapisui:"
 
 # mkdir -p {{ tapisdatadir }}/tapisui
 # myuid=`id -u`
-# docker run -it --rm -v {{ tapisdatadir }}/tapisui:/tapisui tapis/ubutil2204:1.3.0 chown $myuid /tapisui
+# docker run -it --rm -v {{ tapisdatadir }}/tapisui:/tapisui tapis/ubutil2204:1.4.0 chown $myuid /tapisui
 
 # python3 {{ tapisdir }}/admin/util/parse_skexport -c tapisui -d {{ tapisdatadir }}
 
-docker compose up -d
+docker compose up -d
diff --git a/playbooks/roles/tenants/defaults/main/images.yml b/playbooks/roles/tenants/defaults/main/images.yml
@@ -1,5 +1,5 @@
 tenants_pgadmin_image: dpage/pgadmin4:6.20
 tenants_postgres_image: postgres:11.4
-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
+tenants_api_image: tapis/tenants-api:1.4.0
+tenants_migrations_image: tapis/tenants-api-migrations:1.4.0
+tenants_api_tests_image: tapis/tenants-api-tests:1.4.0
diff --git a/playbooks/roles/tenants/templates/docker/burnup b/playbooks/roles/tenants/templates/docker/burnup
@@ -4,7 +4,7 @@ echo "burnup tenants:"
 
 mkdir -p {{ tapisdatadir }}/tenants
 myuid=`id -u`
-docker run -it --rm -v {{ tapisdatadir }}/tenants:/tenants tapis/ubutil2204:1.3.0 chown $myuid /tenants
+docker run -it --rm -v {{ tapisdatadir }}/tenants:/tenants tapis/ubutil2204:1.4.0 chown $myuid /tenants
 python3 {{ tapisdir }}/admin/util/parse_skexport -c tenants -d {{ tapisdatadir }}
 
 docker compose up -d

diff --git a/playbooks/roles/tokens/defaults/main/images.yml b/playbooks/roles/tokens/defaults/main/images.yml
@@ -1,2 +1,2 @@
-tokens_api_image: tapis/tokens-api:1.3.0
-tokens_api_tests_image: tapis/tokens-api-tests:1.3.0
+tokens_api_image: tapis/tokens-api:1.4.0
+tokens_api_tests_image: tapis/tokens-api-tests:1.4.0
diff --git a/playbooks/roles/tokens/templates/docker/burnup b/playbooks/roles/tokens/templates/docker/burnup
@@ -5,7 +5,7 @@ echo "burnup tokens:"
 # Read secrets from env file
 mkdir -p {{ tapisdatadir }}/tokens
 myuid=`id -u`
-docker run -it --rm -v {{ tapisdatadir }}/tokens:/tokens tapis/ubutil2204:1.3.0 chown $myuid /tokens
+docker run -it --rm -v {{ tapisdatadir }}/tokens:/tokens tapis/ubutil2204:1.4.0 chown $myuid /tokens
 python3 {{ tapisdir }}/admin/util/parse_skexport -c tokens -d {{ tapisdatadir }}
 
 docker compose up -d

diff --git a/playbooks/roles/vault/templates/docker/burnup b/playbooks/roles/vault/templates/docker/burnup
@@ -8,7 +8,7 @@ mkdir -p {{ tapisdatadir }}/vault/data
 
 myuid=`id -u`
 
-docker run -it --rm -v {{ tapisdatadir }}/vault:/vault tapis/ubutil2204:1.3.0 chown $myuid /vault
+docker run -it --rm -v {{ tapisdatadir }}/vault:/vault tapis/ubutil2204:1.4.0 chown $myuid /vault
 
 docker run -it -v {{ tapisdatadir }}/vault:/vault {{ vault_image }} chown -R 100:1000 /vault/data
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		globus_proxy_api_image: tapis/globus-proxy:1.3.1
		globus_proxy_api_image: tapis/globus-proxy:1.4.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		tapisui_image: tapis/tapisui:1.3.1
		tapisui_image: tapis/tapisui:1.4.0