From 74c154c90afb20529e00954e091a4acfd4dbd544 Mon Sep 17 00:00:00 2001 From: Tim Collins <45351296+tico24@users.noreply.github.com> Date: Mon, 14 Jun 2021 08:05:28 +0100 Subject: [PATCH] Migrate to Bitnami Mongo DB Chart (#50) * Breaking change: Move from single mongo deployment to mongodb helm chart. No upgrade path for data. Must be done manually. * Use sorry-cypress 1.0.3 --- .github/workflows/lint-test.yml | 9 ++- .github/workflows/release.yml | 3 +- charts/sorry-cypress/Chart.lock | 6 -- charts/sorry-cypress/Chart.yaml | 8 +- charts/sorry-cypress/changelog.md | 3 + charts/sorry-cypress/charts/minio-8.0.9.tgz | Bin 20448 -> 0 bytes charts/sorry-cypress/ci/mongo-values.yaml | 3 - charts/sorry-cypress/templates/_helpers.tpl | 12 ++- .../templates/deployment-api.yml | 6 +- .../templates/deployment-director.yml | 4 +- .../templates/deployment-mongo.yml | 71 ------------------ .../sorry-cypress/templates/service-mongo.yml | 13 ---- .../templates/statefulset-mongo.yml | 58 -------------- .../templates/test/test-connections.yaml | 8 +- charts/sorry-cypress/values.yaml | 51 +++---------- lint.yaml | 1 + test.yaml | 1 + 17 files changed, 48 insertions(+), 209 deletions(-) delete mode 100644 charts/sorry-cypress/Chart.lock create mode 100644 charts/sorry-cypress/changelog.md delete mode 100644 charts/sorry-cypress/charts/minio-8.0.9.tgz delete mode 100644 charts/sorry-cypress/templates/deployment-mongo.yml delete mode 100644 charts/sorry-cypress/templates/service-mongo.yml delete mode 100644 charts/sorry-cypress/templates/statefulset-mongo.yml diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 253501d..5a4735e 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -23,7 +23,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - fetch-depth: 0 + fetch-depth: "0" - name: Set up Helm uses: azure/setup-helm@v1 @@ -36,10 +36,15 @@ jobs: python-version: 3.7 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.0.1 + uses: helm/chart-testing-action@v2.1.0 with: version: v3.4.0 + # - name: Add dependency chart repos + # run: | + # helm repo add minio https://helm.min.io/ --force-update + # helm repo add mongodb https://charts.bitnami.com/bitnami --force-update + - name: Run chart-testing (list-changed) id: list-changed run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80e69c0..4e6dac4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,8 @@ jobs: - name: Add dependency chart repos run: | - helm repo add minio https://helm.min.io/ + helm repo add minio https://helm.min.io/ --force-update + helm repo add mongodb https://charts.bitnami.com/bitnami --force-update - name: Run chart-releaser uses: helm/chart-releaser-action@v1.1.0 diff --git a/charts/sorry-cypress/Chart.lock b/charts/sorry-cypress/Chart.lock deleted file mode 100644 index 682d5eb..0000000 --- a/charts/sorry-cypress/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: minio - repository: https://helm.min.io/ - version: 8.0.9 -digest: sha256:ed2a7d458d9aff458bef0d49e95a01730107ae5b434ba18d27480bc16509fbc5 -generated: "2021-02-02T13:03:35.7935606+02:00" diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml index 7e2e8cc..0ebcc6c 100644 --- a/charts/sorry-cypress/Chart.yaml +++ b/charts/sorry-cypress/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: sorry-cypress description: A Helm chart for Sorry Cypress type: application -version: 0.1.37 -appVersion: 0.6.1 +version: 1.0.0-alpha +appVersion: 1.0.3 home: https://sorry-cypress.dev/ sources: - https://github.com/sorry-cypress/sorry-cypress @@ -16,3 +16,7 @@ dependencies: repository: https://helm.min.io/ version: 8.0.9 condition: minio.enabled + - name: mongodb + repository: https://charts.bitnami.com/bitnami + version: 10.19.0 + condition: mongodb.enabled diff --git a/charts/sorry-cypress/changelog.md b/charts/sorry-cypress/changelog.md new file mode 100644 index 0000000..0291856 --- /dev/null +++ b/charts/sorry-cypress/changelog.md @@ -0,0 +1,3 @@ +# 1.0.0 +## Breaking Changes +Uses the bitnami mongodb helm chart. There is no automated upgrade path from previous versions... you will have to manually migrate data. \ No newline at end of file diff --git a/charts/sorry-cypress/charts/minio-8.0.9.tgz b/charts/sorry-cypress/charts/minio-8.0.9.tgz deleted file mode 100644 index ef98d2ff97994fdb7b62825c1e33c4f73932f709..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20448 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 bFVC0f%k$;=oSy$L00960O}$s10Kx$PEQePN diff --git a/charts/sorry-cypress/ci/mongo-values.yaml b/charts/sorry-cypress/ci/mongo-values.yaml index 15b07bb..16df8fd 100644 --- a/charts/sorry-cypress/ci/mongo-values.yaml +++ b/charts/sorry-cypress/ci/mongo-values.yaml @@ -2,6 +2,3 @@ director: environmentVariables: executionDriver: "../execution/mongo/driver" - -mongo: - enabled: true diff --git a/charts/sorry-cypress/templates/_helpers.tpl b/charts/sorry-cypress/templates/_helpers.tpl index af460fc..a370045 100644 --- a/charts/sorry-cypress/templates/_helpers.tpl +++ b/charts/sorry-cypress/templates/_helpers.tpl @@ -73,11 +73,15 @@ Create the s3 secret {{/* Determine the MongoDB hostname. */}} -{{- define "mongo.hostname" -}} -{{- if .Values.mongo.enabled }} -{{- printf "%s-%s" (include "sorry-cypress-helm.fullname" .) "mongo" -}} +{{- define "mongodb.hostname" -}} +{{- if .Values.mongodb.enabled }} + {{- if eq .Values.mongodb.architecture "standalone" }} + {{- printf "%s-%s" (include "sorry-cypress-helm.fullname" .) "mongodb" -}} + {{- else }} + {{- printf "%s-%s" (include "sorry-cypress-helm.fullname" .) "mongodb-headless" -}} + {{- end }} {{- else }} -{{- printf "%s" .Values.mongo.mongoServer -}} +{{- printf "%s" .Values.mongodb.mongoServer -}} {{- end }} {{- end }} diff --git a/charts/sorry-cypress/templates/deployment-api.yml b/charts/sorry-cypress/templates/deployment-api.yml index 33326f9..8dea964 100644 --- a/charts/sorry-cypress/templates/deployment-api.yml +++ b/charts/sorry-cypress/templates/deployment-api.yml @@ -34,11 +34,11 @@ spec: {{- end }} containers: - env: - {{- if .Values.mongo.enabled }} + {{- if .Values.mongodb.enabled }} - name: MONGODB_DATABASE - value: {{ .Values.mongo.mongoDatabase }} + value: {{ .Values.mongodb.mongoDatabase }} - name: MONGODB_URI - value: mongodb://{{ include "mongo.hostname" . }}:{{ .Values.mongo.service.port }} + value: mongodb://{{ include "mongodb.hostname" . }}:{{ .Values.mongodb.service.port }} {{- end }} image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.api.image.pullPolicy }} diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml index 6d1ebb5..dd7f941 100644 --- a/charts/sorry-cypress/templates/deployment-director.yml +++ b/charts/sorry-cypress/templates/deployment-director.yml @@ -40,9 +40,9 @@ spec: value: {{ .Values.director.environmentVariables.executionDriver }} {{- if eq .Values.director.environmentVariables.executionDriver "../execution/mongo/driver" }} - name: MONGODB_DATABASE - value: {{ .Values.mongo.mongoDatabase }} + value: {{ .Values.mongodb.mongoDatabase }} - name: MONGODB_URI - value: mongodb://{{ include "mongo.hostname" . }}:{{ .Values.mongo.service.port }} + value: mongodb://{{ include "mongodb.hostname" . }}:{{ .Values.mongodb.service.port }} {{- end }} - name: SCREENSHOTS_DRIVER value: {{ .Values.director.environmentVariables.screenshotsDriver }} diff --git a/charts/sorry-cypress/templates/deployment-mongo.yml b/charts/sorry-cypress/templates/deployment-mongo.yml deleted file mode 100644 index ba0cfe7..0000000 --- a/charts/sorry-cypress/templates/deployment-mongo.yml +++ /dev/null @@ -1,71 +0,0 @@ -{{- if and (.Values.mongo.enabled) (not .Values.mongo.persistence.enabled) -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "sorry-cypress-helm.fullname" . }}-mongo -spec: - replicas: 1 - selector: - matchLabels: - app: {{ include "sorry-cypress-helm.fullname" . }}-mongo - template: - metadata: - name: {{ include "sorry-cypress-helm.fullname" . }}-mongo - labels: - app: {{ include "sorry-cypress-helm.fullname" . }}-mongo - {{- with .Values.mongo.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end}} - {{- with .Values.mongo.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - nodeSelector: - {{ toYaml .Values.mongo.nodeSelector | indent 8 }} - {{- with .Values.mongo.tolerations }} - tolerations: - {{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.mongo.affinity }} - affinity: - {{ toYaml . | indent 8 }} - {{- end }} - containers: - - image: "{{ .Values.mongo.image.repository }}:{{ .Values.mongo.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.mongo.image.pullPolicy }} - name: {{ include "sorry-cypress-helm.fullname" . }}-mongo - ports: - - containerPort: 27017 - readinessProbe: - exec: - command: - - mongo - - --eval - - db.adminCommand('ping') - failureThreshold: 6 - initialDelaySeconds: 60 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - resources: - {{- toYaml .Values.mongo.resources | nindent 10 }} - volumeMounts: - - name: mongo-storage - mountPath: /data/db - restartPolicy: Always - serviceAccountName: "" - volumes: - - name: mongo-storage - emptyDir: {} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} -{{- with .Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} -{{- end }} -{{- with .Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/sorry-cypress/templates/service-mongo.yml b/charts/sorry-cypress/templates/service-mongo.yml deleted file mode 100644 index c66a27a..0000000 --- a/charts/sorry-cypress/templates/service-mongo.yml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.mongo.enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "sorry-cypress-helm.fullname" . }}-mongo -spec: - ports: - - name: "27017" - port: {{ .Values.mongo.service.port }} - targetPort: {{ .Values.mongo.service.port }} - selector: - app: {{ include "sorry-cypress-helm.fullname" . }}-mongo -{{- end }} \ No newline at end of file diff --git a/charts/sorry-cypress/templates/statefulset-mongo.yml b/charts/sorry-cypress/templates/statefulset-mongo.yml deleted file mode 100644 index 59fe435..0000000 --- a/charts/sorry-cypress/templates/statefulset-mongo.yml +++ /dev/null @@ -1,58 +0,0 @@ -{{- if and (.Values.mongo.enabled) (.Values.mongo.persistence.enabled) -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "sorry-cypress-helm.fullname" . }}-mongo -spec: - replicas: 1 - selector: - matchLabels: - app: {{ include "sorry-cypress-helm.fullname" . }}-mongo - template: - metadata: - name: {{ include "sorry-cypress-helm.fullname" . }}-mongo - labels: - app: {{ include "sorry-cypress-helm.fullname" . }}-mongo - {{- with .Values.mongo.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end}} - {{- with .Values.mongo.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - containers: - - image: "{{ .Values.mongo.image.repository }}:{{ .Values.mongo.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.mongo.image.pullPolicy }} - name: {{ include "sorry-cypress-helm.fullname" . }}-mongo - ports: - - containerPort: 27017 - readinessProbe: - exec: - command: - - mongo - - --eval - - db.adminCommand('ping') - failureThreshold: 6 - initialDelaySeconds: 60 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - resources: - {{- toYaml .Values.mongo.resources | nindent 10 }} - volumeMounts: - - name: mongo-storage - mountPath: /data/db - restartPolicy: Always - serviceAccountName: "" - serviceName: {{ include "sorry-cypress-helm.fullname" . }}-mongo - volumeClaimTemplates: - - metadata: - name: mongo-storage - spec: - accessModes: - - {{ .Values.mongo.persistence.accessMode }} - resources: - requests: - storage: {{ .Values.mongo.persistence.size }} -{{- end }} \ No newline at end of file diff --git a/charts/sorry-cypress/templates/test/test-connections.yaml b/charts/sorry-cypress/templates/test/test-connections.yaml index d9cca17..d786dcb 100644 --- a/charts/sorry-cypress/templates/test/test-connections.yaml +++ b/charts/sorry-cypress/templates/test/test-connections.yaml @@ -34,13 +34,13 @@ spec: args: ['{{ include "sorry-cypress-helm.fullname" . }}-director:{{ .Values.director.service.port }}'] restartPolicy: Never --- -{{- if .Values.mongo.enabled }} +{{- if .Values.mongodb.enabled }} apiVersion: v1 kind: Pod metadata: - name: "{{ include "sorry-cypress-helm.fullname" . }}-test-mongo-connection" + name: "{{ include "sorry-cypress-helm.fullname" . }}-test-mongodb-connection" labels: - app.kubernetes.io/name: "{{ include "sorry-cypress-helm.fullname" . }}-test-mongo-connection" + app.kubernetes.io/name: "{{ include "sorry-cypress-helm.fullname" . }}-test-mongodb-connection" annotations: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": hook-succeeded @@ -49,7 +49,7 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "sorry-cypress-helm.fullname" . }}-mongo:{{ .Values.mongo.service.port }}'] + args: ['{{ include "sorry-cypress-helm.fullname" . }}-mongodb-headless:{{ .Values.mongodb.service.port }}'] restartPolicy: Never {{- end }} --- diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml index d6f7925..73f7d0b 100644 --- a/charts/sorry-cypress/values.yaml +++ b/charts/sorry-cypress/values.yaml @@ -30,9 +30,8 @@ api: service: port: 4000 - # If you are using v10.0.0-beta.15 or greater, you can enable a readinessProbe for the API pods. readinessProbe: - enabled: false + enabled: true periodSeconds: 5 timeoutSeconds: 3 successThreshold: 2 @@ -178,51 +177,20 @@ director: # hosts: # - chart-example.local -mongo: - # You need to ensure that director.environmentVariables.executionDriver is set to "../execution/mongo/driver" if you want mongo.enabled to be true. +mongodb: + # You need to ensure that director.environmentVariables.executionDriver is set to "../execution/mongo/driver" if you want the director to use mongodb. enabled: true - mongoDatabase: "sorry-cypress" - # Ignored if mongo.enabled is set to true mongoServer: "" - image: - repository: mongo - pullPolicy: Always - tag: "4.0" - - nodeSelector: {} - - tolerations: [] - - affinity: {} - + # If enabled, you can use any values from the mongodb helm chart: https://github.com/bitnami/charts/blob/master/bitnami/mongodb/values.yaml + # Below are the bare minimim to get you started. + architecture: replicaset + auth: + enabled: false persistence: enabled: false - accessMode: "ReadWriteOnce" - size: "1Gi" - - resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - - # Set annotations for pods - podAnnotations: {} - - # Additional pod labels - podLabels: {} - - service: - port: 27017 s3: bucketName: example-bucket @@ -254,6 +222,9 @@ s3: minio: enabled: false + # If enabled, you can include any values from the minio helm chart: https://github.com/minio/charts/blob/master/minio/values.yaml + # Below are the bare minimim to get you started. + endpoint: storage.yourdomain.com url: http://storage.yourdomain.com diff --git a/lint.yaml b/lint.yaml index 85ced4e..69433f0 100644 --- a/lint.yaml +++ b/lint.yaml @@ -3,5 +3,6 @@ remote: origin target-branch: main chart-repos: - minio=https://helm.min.io + - mongodb=https://charts.bitnami.com/bitnami chart-dirs: - charts diff --git a/test.yaml b/test.yaml index 5aa4e78..88551a3 100644 --- a/test.yaml +++ b/test.yaml @@ -3,6 +3,7 @@ remote: origin target-branch: main chart-repos: - minio=https://helm.min.io + - mongodb=https://charts.bitnami.com/bitnami chart-dirs: - charts helm-extra-args: --timeout 600s