Skip to content

Commit

Permalink
helm: Remove unused PVC resources (#12387)
Browse files Browse the repository at this point in the history
  • Loading branch information
@martimors @suhomud
martimors authored and suhomud committed May 23, 2022
1 parent 3d30180 commit bbce6ed
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 71 deletions.
2 changes: 1 addition & 1 deletion charts/airbyte/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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: 0.3.1
version: 0.3.2

# 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
Expand Down
73 changes: 46 additions & 27 deletions charts/airbyte/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ Helm charts for Airbyte.

### Global Parameters

| Name | Description | Value |
| ---------------------- | -------------------------------------------- | ----- |
| `global.imageRegistry` | Global Docker image registry | `""` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` |
| Name | Description | Value |
| ---------------------- | ---------------------------- | ----- |
| `global.imageRegistry` | Global Docker image registry | `""` |


### Common Parameters
Expand All @@ -31,7 +30,7 @@ Helm charts for Airbyte.
| `webapp.replicaCount` | Number of webapp replicas | `1` |
| `webapp.image.repository` | The repository to use for the airbyte webapp image. | `airbyte/webapp` |
| `webapp.image.pullPolicy` | the pull policy to use for the airbyte webapp image | `IfNotPresent` |
| `webapp.image.tag` | The airbyte webapp image tag. Defaults to the chart's AppVersion | `0.36.6-alpha` |
| `webapp.image.tag` | The airbyte webapp image tag. Defaults to the chart's AppVersion | `0.36.6-alpha` |
| `webapp.podAnnotations` | Add extra annotations to the webapp pod(s) | `{}` |
| `webapp.containerSecurityContext` | Security context for the container | `{}` |
| `webapp.livenessProbe.enabled` | Enable livenessProbe on the webapp | `true` |
Expand Down Expand Up @@ -68,19 +67,35 @@ Helm charts for Airbyte.

### Scheduler Parameters

| Name | Description | Value |
| ------------------------------ | ------------------------------------------------------------------- | ------------------- |
| `scheduler.replicaCount` | Number of scheduler replicas | `1` |
| `scheduler.image.repository` | The repository to use for the airbyte scheduler image. | `airbyte/scheduler` |
| `scheduler.image.pullPolicy` | the pull policy to use for the airbyte scheduler image | `IfNotPresent` |
| `scheduler.image.tag` | The airbyte scheduler image tag. Defaults to the chart's AppVersion | `0.36.6-alpha` |
| `scheduler.podAnnotations` | Add extra annotations to the scheduler pod | `{}` |
| `scheduler.resources.limits` | The resources limits for the scheduler container | `{}` |
| `scheduler.resources.requests` | The requested resources for the scheduler container | `{}` |
| `scheduler.nodeSelector` | Node labels for pod assignment | `{}` |
| `scheduler.tolerations` | Tolerations for scheduler pod assignment. | `[]` |
| `scheduler.log.level` | The log level to log at. | `INFO` |
| `scheduler.extraEnv` | Additional env vars for scheduler pod(s). | `[]` |
| Name | Description | Value |
| ---------------------------------------------- | ------------------------------------------------------------------- | ------------------- |
| `scheduler.replicaCount` | Number of scheduler replicas | `1` |
| `scheduler.image.repository` | The repository to use for the airbyte scheduler image. | `airbyte/scheduler` |
| `scheduler.image.pullPolicy` | the pull policy to use for the airbyte scheduler image | `IfNotPresent` |
| `scheduler.image.tag` | The airbyte scheduler image tag. Defaults to the chart's AppVersion | `0.36.6-alpha` |
| `scheduler.podAnnotations` | Add extra annotations to the scheduler pod | `{}` |
| `scheduler.containerSecurityContext` | Security context for the container | `{}` |
| `scheduler.livenessProbe.enabled` | Enable livenessProbe on the scheduler | `true` |
| `scheduler.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `5` |
| `scheduler.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `30` |
| `scheduler.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `1` |
| `scheduler.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `3` |
| `scheduler.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` |
| `scheduler.readinessProbe.enabled` | Enable readinessProbe on the scheduler | `true` |
| `scheduler.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `5` |
| `scheduler.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `30` |
| `scheduler.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` |
| `scheduler.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `3` |
| `scheduler.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` |
| `scheduler.resources.limits` | The resources limits for the scheduler container | `{}` |
| `scheduler.resources.requests` | The requested resources for the scheduler container | `{}` |
| `scheduler.nodeSelector` | Node labels for pod assignment | `{}` |
| `scheduler.tolerations` | Tolerations for scheduler pod assignment. | `[]` |
| `scheduler.affinity` | Affinity and anti-affinity for scheduler pod assignment. | `{}` |
| `scheduler.log.level` | The log level to log at. | `INFO` |
| `scheduler.extraEnv` | Additional env vars for scheduler pod(s). | `[]` |
| `scheduler.extraVolumeMounts` | Additional volumeMounts for scheduler container(s). | `[]` |
| `scheduler.extraVolumes` | Additional volumes for scheduler pod(s). | `[]` |


### Pod Sweeper parameters
Expand Down Expand Up @@ -139,9 +154,6 @@ Helm charts for Airbyte.
| `server.resources.requests` | The requested resources for the server container | `{}` |
| `server.service.type` | The service type to use for the API server | `ClusterIP` |
| `server.service.port` | The service port to expose the API server on | `8001` |
| `server.persistence.accessMode` | The access mode for the airbyte server pvc | `ReadWriteOnce` |
| `server.persistence.size` | The size of the pvc to use for the airbyte server pvc | `1Gi` |
| `server.persistence.storageClass` | The storage class to use for the airbyte server pvc | `""` |
| `server.nodeSelector` | Node labels for pod assignment | `{}` |
| `server.tolerations` | Tolerations for server pod assignment. | `[]` |
| `server.affinity` | Affinity and anti-affinity for server pod assignment. | `{}` |
Expand Down Expand Up @@ -191,6 +203,9 @@ Helm charts for Airbyte.
| `bootloader.image.repository` | The repository to use for the airbyte bootloader image. | `airbyte/bootloader` |
| `bootloader.image.pullPolicy` | the pull policy to use for the airbyte bootloader image | `IfNotPresent` |
| `bootloader.image.tag` | The airbyte bootloader image tag. Defaults to the chart's AppVersion | `0.36.6-alpha` |
| `bootloader.podAnnotations` | Add extra annotations to the bootloader pod | `{}` |
| `bootloader.nodeSelector` | Node labels for pod assignment | `{}` |
| `bootloader.tolerations` | Tolerations for worker pod assignment. | `[]` |


### Temporal parameters
Expand Down Expand Up @@ -268,13 +283,17 @@ Helm charts for Airbyte.
| `logs.gcs.credentials` | The path the GCS creds are written to | `""` |
| `logs.gcs.credentialsJson` | Base64 encoded json GCP credentials file contents | `""` |


### Minio chart overwrites

| Name | Description | Value |
| -------------------------- | -------------------------------- | ---------- |
| `minio.accessKey.password` | Minio Access Key | `minio` |
| `minio.secretKey.password` | Minio Secret Key | `minio123` |
| `jobs.resources.limits` | The resources limits for jobs | `{}` |
| `jobs.resources.requests` | The requested resources for jobs | `{}` |
| Name | Description | Value |
| -------------------------- | -------------------------------------------- | ---------- |
| `minio.accessKey.password` | Minio Access Key | `minio` |
| `minio.secretKey.password` | Minio Secret Key | `minio123` |
| `jobs.resources.limits` | The resources limits for jobs | `{}` |
| `jobs.resources.requests` | The requested resources for jobs | `{}` |
| `jobs.kube.annotations` | key/value annotations applied to kube jobs | `{}` |
| `jobs.kube.nodeSelector` | key/value node selector applied to kube jobs | `{}` |
| `jobs.kube.tolerations` | Tolerations for jobs.kube pod assignment. | `[]` |


9 changes: 0 additions & 9 deletions charts/airbyte/templates/server/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,22 +210,13 @@ spec:
securityContext: {{- toYaml .Values.server.containerSecurityContext | nindent 10 }}
{{- end }}
volumeMounts:
- name: airbyte-data
mountPath: /configs
subPath: configs
- name: airbyte-data
mountPath: /workspace
subPath: workspace
- name: gcs-log-creds-volume
mountPath: /secrets/gcs-log-creds
readOnly: true
{{- if .Values.server.extraVolumeMounts }}
{{ toYaml .Values.server.extraVolumeMounts | nindent 8 }}
{{- end }}
volumes:
- name: airbyte-data
persistentVolumeClaim:
claimName: {{ include "common.names.fullname" . }}-data
- name: gcs-log-creds-volume
secret:
secretName: {{ include "common.names.fullname" . }}-gcs-log-creds
Expand Down
14 changes: 0 additions & 14 deletions charts/airbyte/templates/server/pvc-data.yaml
View file

This file was deleted.

24 changes: 4 additions & 20 deletions charts/airbyte/values.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
## @section Global Parameters

## @param global.imageRegistry Global Docker image registry
## @param global.storageClass Global StorageClass for Persistent Volume(s)
##
global:
imageRegistry: ""
storageClass: ""

## @section Common Parameters

Expand Down Expand Up @@ -512,20 +510,6 @@ server:
type: ClusterIP
port: 8001

## @param server.persistence.accessMode The access mode for the airbyte server pvc
## @param server.persistence.size The size of the pvc to use for the airbyte server pvc
persistence:
size: 1Gi
accessMode: ReadWriteOnce
## @param server.persistence.storageClass The storage class to use for the airbyte server pvc
## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning
## If undefined (the default) or set to null, no storageClassName spec is
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
storageClass: ""

## @param server.nodeSelector [object] Node labels for pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/
##
Expand Down Expand Up @@ -922,8 +906,8 @@ logs:

## Google Cloud Storage (GCS) Log Location Configuration
## @param logs.gcs.bucket GCS bucket name
## @param logs.gcs.credentials The path the GCS creds file is located
## @param logs.gcs.credentialsJson Base64 encoded JSON credentials
## @param logs.gcs.credentials The path the GCS creds are written to
## @param logs.gcs.credentialsJson Base64 encoded json GCP credentials file contents
gcs:
bucket: ""
# If you are mounting an existing secret to extraVolumes on scheduler, server and worker
Expand Down Expand Up @@ -965,12 +949,12 @@ jobs:
kube:
## JOB_KUBE_ANNOTATIONS
## pod annotations of the sync job and the default pod annotations fallback for others jobs
## @params jobs.kube.annotations [object] key/value annotations applied to kube jobs
## @param jobs.kube.annotations [object] key/value annotations applied to kube jobs
annotations: {}

## JOB_KUBE_NODE_SELECTORS
## pod node selector of the sync job and the default pod node selector fallback for others jobs
## @params jobs.kubeSelector [object] key/value node selector applied to kube jobs
## @param jobs.kube.nodeSelector [object] key/value node selector applied to kube jobs
nodeSelector: {}

## JOB_KUBE_TOLERATIONS
Expand Down

0 comments on commit bbce6ed

Please sign in to comment.