diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml index 6adb32bd..84795f4d 100644 --- a/charts/lagoon-core/Chart.yaml +++ b/charts/lagoon-core/Chart.yaml @@ -40,5 +40,7 @@ dependencies: # Valid supported kinds are added, changed, deprecated, removed, fixed and security annotations: artifacthub.io/changes: | + - kind: changed + description: remove unused legacy registry setting from core - kind: changed description: modify keycloak liveness and readiness endpoint diff --git a/charts/lagoon-core/ci/linter-values.yaml b/charts/lagoon-core/ci/linter-values.yaml index 610c1ce0..5278a7eb 100644 --- a/charts/lagoon-core/ci/linter-values.yaml +++ b/charts/lagoon-core/ci/linter-values.yaml @@ -3,7 +3,6 @@ # To be deprecated - see uselagoon/lagoon#2907 harborURL: http://disabled-only-use-harbor-via-deploy-controller.invalid harborAdminPassword: not-needed -registry: disabled-only-use-harbor-via-deploy-controller.invalid # used in api elasticsearchURL: http://opendistro-es-client-service.opendistro-es.svc.cluster.local:9200 diff --git a/charts/lagoon-core/templates/api.deployment.yaml b/charts/lagoon-core/templates/api.deployment.yaml index 5f469bf6..482721db 100644 --- a/charts/lagoon-core/templates/api.deployment.yaml +++ b/charts/lagoon-core/templates/api.deployment.yaml @@ -126,8 +126,6 @@ spec: key: RABBITMQ_USERNAME - name: REDIS_HOST value: {{ include "lagoon-core.apiRedis.fullname" . }} - - name: REGISTRY - value: {{ required "A valid .Values.registry required!" .Values.registry | quote }} - name: S3_FILES_BUCKET value: {{ required "A valid .Values.s3FilesBucket required!" .Values.s3FilesBucket | quote }} - name: S3_FILES_HOST diff --git a/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml b/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml index 9efabf37..d9ee07a5 100644 --- a/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml +++ b/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml @@ -94,8 +94,6 @@ spec: secretKeyRef: name: {{ include "lagoon-core.broker.fullname" . }} key: RABBITMQ_USERNAME - - name: REGISTRY - value: {{ required "A valid .Values.registry required!" .Values.registry | quote }} {{- range $key, $val := .Values.webhooks2tasks.additionalEnvs }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/charts/lagoon-core/values.yaml b/charts/lagoon-core/values.yaml index f37eea9a..9b1b167d 100644 --- a/charts/lagoon-core/values.yaml +++ b/charts/lagoon-core/values.yaml @@ -4,7 +4,6 @@ # elasticsearchURL: # harborURL: # kibanaURL: -# registry: # s3BAASSecretAccessKey: # s3BAASAccessKeyID: # s3FilesAccessKeyID: