diff --git a/Chart.yaml b/Chart.yaml index c3cc415..6630cb4 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: quay description: Red Hat Quay Registry Resources type: application -version: 0.2.0 +version: 0.2.1 appVersion: "3.9" home: https://github.com/validatedpatterns/quay-chart maintainers: diff --git a/files/s3-credentials-setup.sh b/files/s3-credentials-setup.sh index 4af18e5..6259ea8 100755 --- a/files/s3-credentials-setup.sh +++ b/files/s3-credentials-setup.sh @@ -44,6 +44,13 @@ if [[ -z "${bucket_port}" ]]; then bucket_port="443" fi +# nginx's async resolver does not apply /etc/resolv.conf search domains, so bare +# service names like s3.openshift-storage.svc return NXDOMAIN. Ensure the stored +# hostname is a FQDN so the proxy resolver can resolve it without search expansion. +if [[ "${bucket_host}" != *.cluster.local ]]; then + bucket_host="${bucket_host}.cluster.local" +fi + if [[ "${bucket_port}" == "443" ]]; then is_secure="true" else diff --git a/templates/quay-config-bundle-secret.yaml b/templates/quay-config-bundle-secret.yaml index a6821b8..850393e 100644 --- a/templates/quay-config-bundle-secret.yaml +++ b/templates/quay-config-bundle-secret.yaml @@ -34,7 +34,7 @@ stringData: TESTING: false CREATE_NAMESPACE_ON_PUSH: true # Proxy all storage traffic through Quay instead of direct client access - FEATURE_PROXY_STORAGE: true + FEATURE_PROXY_STORAGE: {{ .Values.quay.proxyStorage.enabled }} # Template only. quay-s3-credentials-setup replaces the placeholders # from the bound ObjectBucketClaim. DISTRIBUTED_STORAGE_CONFIG: diff --git a/values.yaml b/values.yaml index d153f9a..51b721d 100644 --- a/values.yaml +++ b/values.yaml @@ -15,6 +15,8 @@ quay: name: quay-init-config-bundle-secret # -- Secret QuayRegistry reads after the S3 job fills credentials. s3Name: quay-config-with-s3 + proxyStorage: + enabled: true storage: postgres: # -- Persistent volume size for the Quay PostgreSQL database.