diff --git a/charts/cosmotech-api/Chart.yaml b/charts/cosmotech-api/Chart.yaml index dab35fc..701b35c 100644 --- a/charts/cosmotech-api/Chart.yaml +++ b/charts/cosmotech-api/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 5.2.0 +version: 5.2.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/cosmotech-api/README.md b/charts/cosmotech-api/README.md index db9b7e5..308095b 100644 --- a/charts/cosmotech-api/README.md +++ b/charts/cosmotech-api/README.md @@ -1,6 +1,6 @@ # cosmotech-api -![Version: 5.2.0](https://img.shields.io/badge/Version-5.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.2.0](https://img.shields.io/badge/AppVersion-5.2.0-informational?style=flat-square) +![Version: 5.2.1](https://img.shields.io/badge/Version-5.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.2.0](https://img.shields.io/badge/AppVersion-5.2.0-informational?style=flat-square) Cosmo Tech Platform API @@ -824,11 +824,9 @@ This markdown guide provides a comprehensive walkthrough for deploying the Cosmo | deploymentStrategy.rollingUpdate.maxUnavailable | string | `"50%"` | maximum number of Pods that can be unavailable during the update process | | fullnameOverride | string | `""` | value overriding the full name of the Chart. If not set, the value is computed from `nameOverride`. Truncated at 63 chars because some Kubernetes name fields are limited to this. | | image.pullPolicy | string | `"Always"` | [policy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) for pulling the image | +| image.pullSecret | string | `""` | name of the secret containing registry credentials to pull private images | | image.repository | string | `"ghcr.io/cosmo-tech/cosmotech-api"` | container image to use for deployment | | image.tag | string | `""` | container image tag. Defaults to the Chart `appVersion` if empty or missing | -| imageCredentials.password | string | `""` | password for registry to use for pulling the Deployment image. Useful if you are using a private registry | -| imageCredentials.registry | string | `""` | container registry to use for pulling the Deployment image. Useful if you are using a private registry | -| imageCredentials.username | string | `""` | username for the container registry to use for pulling the Deployment image. Useful if you are using a private registry | | ingress.annotations | object | `{}` | | | ingress.enabled | bool | `false` | | | ingress.hosts[0].host | string | `"chart-example.local"` | | diff --git a/charts/cosmotech-api/templates/deployment.yaml b/charts/cosmotech-api/templates/deployment.yaml index 81acc1a..76704f8 100644 --- a/charts/cosmotech-api/templates/deployment.yaml +++ b/charts/cosmotech-api/templates/deployment.yaml @@ -33,9 +33,9 @@ spec: {{- include "cosmotech-api.defaultNetworkPolicy" . | nindent 8 }} {{- include "cosmotech-api.selectorLabels" . | nindent 8 }} spec: - {{- if .Values.imageCredentials.registry }} + {{- if .Values.image.pullSecret }} imagePullSecrets: - - name: {{ include "cosmotech-api.fullname" . }}-registry + - name: {{ .Values.image.pullSecret }} {{- end }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} diff --git a/charts/cosmotech-api/templates/registry.secret.yaml b/charts/cosmotech-api/templates/registry.secret.yaml index d0a9310..2f54d32 100644 --- a/charts/cosmotech-api/templates/registry.secret.yaml +++ b/charts/cosmotech-api/templates/registry.secret.yaml @@ -2,22 +2,6 @@ SPDX-FileCopyrightText: Copyright (C) 2022-2026 Cosmo Tech SPDX-License-Identifier: MIT */}} -{{- if .Values.imageCredentials.registry }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "cosmotech-api.fullname" . }}-registry - namespace: {{ .Release.Namespace }} - labels: - {{- include "cosmotech-api.labels" . | nindent 4 }} - annotations: - email: "platform@cosmotech.com" -type: kubernetes.io/dockerconfigjson -data: - .dockerconfigjson: {{ template "cosmotech-api.imagePullSecret" . }} -{{- end }} - ---- {{- if .Values.argo.imageCredentials.registry }} apiVersion: v1 kind: Secret diff --git a/charts/cosmotech-api/values.yaml b/charts/cosmotech-api/values.yaml index c2f4047..48d8e7c 100644 --- a/charts/cosmotech-api/values.yaml +++ b/charts/cosmotech-api/values.yaml @@ -11,22 +11,13 @@ replicaCount: 1 image: # -- container image to use for deployment repository: ghcr.io/cosmo-tech/cosmotech-api + # -- name of the secret containing registry credentials to pull private images + pullSecret: "" # -- [policy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) for pulling the image pullPolicy: Always # -- container image tag. Defaults to the Chart `appVersion` if empty or missing tag: "" -#imagePullSecrets: [] - -# Set image pull secrets (in case you're using a private container registry). -imageCredentials: - # -- container registry to use for pulling the Deployment image. Useful if you are using a private registry - registry: "" - # -- username for the container registry to use for pulling the Deployment image. Useful if you are using a private registry - username: "" - # -- password for registry to use for pulling the Deployment image. Useful if you are using a private registry - password: "" - # -- value overriding the name of the Chart. Defaults to the Chart name. # Truncated at 63 chars because some Kubernetes name fields are limited to this. nameOverride: ""