From 929280973a732a319ae6d37c4c8fa64fcaf52ba5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Petersen" Date: Wed, 20 Sep 2023 12:39:08 -0400 Subject: [PATCH] Add openapi-schema files to deployment yaml and adjust directory --- ...thentication.concierge.pinniped.dev_jwtauthenticators.yaml | 0 ...tication.concierge.pinniped.dev_webhookauthenticators.yaml | 0 .../config.concierge.pinniped.dev_credentialissuers.yaml | 0 deploy/concierge/{ => config}/deployment.yaml | 0 deploy/concierge/{ => config}/helpers.lib.yaml | 0 deploy/concierge/{ => config}/rbac.yaml | 0 deploy/concierge/{ => config}/values.yaml | 0 deploy/concierge/{ => config}/z0_crd_overlay.yaml | 0 .../config.supervisor.pinniped.dev_federationdomains.yaml | 0 .../config.supervisor.pinniped.dev_oidcclients.yaml | 0 deploy/supervisor/{ => config}/deployment.yaml | 0 deploy/supervisor/{ => config}/helpers.lib.yaml | 0 ...ervisor.pinniped.dev_activedirectoryidentityproviders.yaml | 0 .../idp.supervisor.pinniped.dev_ldapidentityproviders.yaml | 0 .../idp.supervisor.pinniped.dev_oidcidentityproviders.yaml | 0 deploy/supervisor/{ => config}/rbac.yaml | 0 deploy/supervisor/{ => config}/service.yaml | 0 deploy/supervisor/{ => config}/values.yaml | 0 deploy/supervisor/{ => config}/z0_crd_overlay.yaml | 0 hack/prepare-for-integration-tests.sh | 4 ++-- 20 files changed, 2 insertions(+), 2 deletions(-) rename deploy/concierge/{ => config}/authentication.concierge.pinniped.dev_jwtauthenticators.yaml (100%) rename deploy/concierge/{ => config}/authentication.concierge.pinniped.dev_webhookauthenticators.yaml (100%) rename deploy/concierge/{ => config}/config.concierge.pinniped.dev_credentialissuers.yaml (100%) rename deploy/concierge/{ => config}/deployment.yaml (100%) rename deploy/concierge/{ => config}/helpers.lib.yaml (100%) rename deploy/concierge/{ => config}/rbac.yaml (100%) rename deploy/concierge/{ => config}/values.yaml (100%) rename deploy/concierge/{ => config}/z0_crd_overlay.yaml (100%) rename deploy/supervisor/{ => config}/config.supervisor.pinniped.dev_federationdomains.yaml (100%) rename deploy/supervisor/{ => config}/config.supervisor.pinniped.dev_oidcclients.yaml (100%) rename deploy/supervisor/{ => config}/deployment.yaml (100%) rename deploy/supervisor/{ => config}/helpers.lib.yaml (100%) rename deploy/supervisor/{ => config}/idp.supervisor.pinniped.dev_activedirectoryidentityproviders.yaml (100%) rename deploy/supervisor/{ => config}/idp.supervisor.pinniped.dev_ldapidentityproviders.yaml (100%) rename deploy/supervisor/{ => config}/idp.supervisor.pinniped.dev_oidcidentityproviders.yaml (100%) rename deploy/supervisor/{ => config}/rbac.yaml (100%) rename deploy/supervisor/{ => config}/service.yaml (100%) rename deploy/supervisor/{ => config}/values.yaml (100%) rename deploy/supervisor/{ => config}/z0_crd_overlay.yaml (100%) diff --git a/deploy/concierge/authentication.concierge.pinniped.dev_jwtauthenticators.yaml b/deploy/concierge/config/authentication.concierge.pinniped.dev_jwtauthenticators.yaml similarity index 100% rename from deploy/concierge/authentication.concierge.pinniped.dev_jwtauthenticators.yaml rename to deploy/concierge/config/authentication.concierge.pinniped.dev_jwtauthenticators.yaml diff --git a/deploy/concierge/authentication.concierge.pinniped.dev_webhookauthenticators.yaml b/deploy/concierge/config/authentication.concierge.pinniped.dev_webhookauthenticators.yaml similarity index 100% rename from deploy/concierge/authentication.concierge.pinniped.dev_webhookauthenticators.yaml rename to deploy/concierge/config/authentication.concierge.pinniped.dev_webhookauthenticators.yaml diff --git a/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml b/deploy/concierge/config/config.concierge.pinniped.dev_credentialissuers.yaml similarity index 100% rename from deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml rename to deploy/concierge/config/config.concierge.pinniped.dev_credentialissuers.yaml diff --git a/deploy/concierge/deployment.yaml b/deploy/concierge/config/deployment.yaml similarity index 100% rename from deploy/concierge/deployment.yaml rename to deploy/concierge/config/deployment.yaml diff --git a/deploy/concierge/helpers.lib.yaml b/deploy/concierge/config/helpers.lib.yaml similarity index 100% rename from deploy/concierge/helpers.lib.yaml rename to deploy/concierge/config/helpers.lib.yaml diff --git a/deploy/concierge/rbac.yaml b/deploy/concierge/config/rbac.yaml similarity index 100% rename from deploy/concierge/rbac.yaml rename to deploy/concierge/config/rbac.yaml diff --git a/deploy/concierge/values.yaml b/deploy/concierge/config/values.yaml similarity index 100% rename from deploy/concierge/values.yaml rename to deploy/concierge/config/values.yaml diff --git a/deploy/concierge/z0_crd_overlay.yaml b/deploy/concierge/config/z0_crd_overlay.yaml similarity index 100% rename from deploy/concierge/z0_crd_overlay.yaml rename to deploy/concierge/config/z0_crd_overlay.yaml diff --git a/deploy/supervisor/config.supervisor.pinniped.dev_federationdomains.yaml b/deploy/supervisor/config/config.supervisor.pinniped.dev_federationdomains.yaml similarity index 100% rename from deploy/supervisor/config.supervisor.pinniped.dev_federationdomains.yaml rename to deploy/supervisor/config/config.supervisor.pinniped.dev_federationdomains.yaml diff --git a/deploy/supervisor/config.supervisor.pinniped.dev_oidcclients.yaml b/deploy/supervisor/config/config.supervisor.pinniped.dev_oidcclients.yaml similarity index 100% rename from deploy/supervisor/config.supervisor.pinniped.dev_oidcclients.yaml rename to deploy/supervisor/config/config.supervisor.pinniped.dev_oidcclients.yaml diff --git a/deploy/supervisor/deployment.yaml b/deploy/supervisor/config/deployment.yaml similarity index 100% rename from deploy/supervisor/deployment.yaml rename to deploy/supervisor/config/deployment.yaml diff --git a/deploy/supervisor/helpers.lib.yaml b/deploy/supervisor/config/helpers.lib.yaml similarity index 100% rename from deploy/supervisor/helpers.lib.yaml rename to deploy/supervisor/config/helpers.lib.yaml diff --git a/deploy/supervisor/idp.supervisor.pinniped.dev_activedirectoryidentityproviders.yaml b/deploy/supervisor/config/idp.supervisor.pinniped.dev_activedirectoryidentityproviders.yaml similarity index 100% rename from deploy/supervisor/idp.supervisor.pinniped.dev_activedirectoryidentityproviders.yaml rename to deploy/supervisor/config/idp.supervisor.pinniped.dev_activedirectoryidentityproviders.yaml diff --git a/deploy/supervisor/idp.supervisor.pinniped.dev_ldapidentityproviders.yaml b/deploy/supervisor/config/idp.supervisor.pinniped.dev_ldapidentityproviders.yaml similarity index 100% rename from deploy/supervisor/idp.supervisor.pinniped.dev_ldapidentityproviders.yaml rename to deploy/supervisor/config/idp.supervisor.pinniped.dev_ldapidentityproviders.yaml diff --git a/deploy/supervisor/idp.supervisor.pinniped.dev_oidcidentityproviders.yaml b/deploy/supervisor/config/idp.supervisor.pinniped.dev_oidcidentityproviders.yaml similarity index 100% rename from deploy/supervisor/idp.supervisor.pinniped.dev_oidcidentityproviders.yaml rename to deploy/supervisor/config/idp.supervisor.pinniped.dev_oidcidentityproviders.yaml diff --git a/deploy/supervisor/rbac.yaml b/deploy/supervisor/config/rbac.yaml similarity index 100% rename from deploy/supervisor/rbac.yaml rename to deploy/supervisor/config/rbac.yaml diff --git a/deploy/supervisor/service.yaml b/deploy/supervisor/config/service.yaml similarity index 100% rename from deploy/supervisor/service.yaml rename to deploy/supervisor/config/service.yaml diff --git a/deploy/supervisor/values.yaml b/deploy/supervisor/config/values.yaml similarity index 100% rename from deploy/supervisor/values.yaml rename to deploy/supervisor/config/values.yaml diff --git a/deploy/supervisor/z0_crd_overlay.yaml b/deploy/supervisor/config/z0_crd_overlay.yaml similarity index 100% rename from deploy/supervisor/z0_crd_overlay.yaml rename to deploy/supervisor/config/z0_crd_overlay.yaml diff --git a/hack/prepare-for-integration-tests.sh b/hack/prepare-for-integration-tests.sh index a8a1219c..d1230daf 100755 --- a/hack/prepare-for-integration-tests.sh +++ b/hack/prepare-for-integration-tests.sh @@ -338,7 +338,7 @@ if [ "$alternate_deploy" != "undefined" ] || [ "$alternate_deploy_supervisor" != fi else log_note "Deploying the Pinniped Supervisor app to the cluster using kapp..." - pushd deploy/supervisor >/dev/null + pushd deploy/supervisor/config >/dev/null ytt --file . \ --data-value "app_name=$supervisor_app_name" \ --data-value "namespace=$supervisor_namespace" \ @@ -380,7 +380,7 @@ if [ "$alternate_deploy" != "undefined" ] || [ "$alternate_deploy_concierge" != fi else log_note "Deploying the Pinniped Concierge app to the cluster using kapp..." - pushd deploy/concierge >/dev/null + pushd deploy/concierge/config >/dev/null ytt --file . \ --data-value "app_name=$concierge_app_name" \ --data-value "namespace=$concierge_namespace" \