Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(ci): Deploy gen3 chart on pull requests #76

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions .github/workflows/lint_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,26 @@ jobs:
fi

- name: Run chart-testing (lint)
if: steps.list-changed.outputs.changed == 'true'
run: ct lint --config .github/ct.yaml

- name: Create kind cluster
uses: helm/kind-action@v1.4.0
if: steps.list-changed.outputs.changed == 'true'

- name: Run chart-testing gen3 (install)
if: steps.list-changed.outputs.changed == 'true'
run: ct install --config .github/ct.yaml --charts helm/gen3

# - name: Run chart-testing gen3 (upgrade)
# if: steps.list-changed.outputs.changed == 'true'
# run: ct install --upgrade --debug --chart-dirs helm --charts helm/gen3


# deploy-charts-to-kind:
# name: ${{ matrix.environments }} - gen3 data portal build
# timeout-minutes: 20
# runs-on: ubuntu-latest
# needs: [get-changes-for-envs]
# if: ${{ needs.get-changes-for-envs.outputs.matrix != '[]' && needs.get-changes-for-envs.outputs.matrix != '' }}
# steps:
# - name: Create kind cluster
# uses: helm/kind-action@v1.4.0
# if: steps.list-changed.outputs.changed == 'true'

# - name: Run chart-testing (install)
# run: ct install
4 changes: 2 additions & 2 deletions helm/ambassador/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "ambassador.fullname" . }}
name: ambassador-{{ .Release.Namespace }}
rules:
- apiGroups: [""]
resources:
Expand All @@ -25,7 +25,7 @@ metadata:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "ambassador.fullname" . }}
name: ambassador-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: ambassador
Expand Down
2 changes: 1 addition & 1 deletion helm/common/templates/_postgres_secrets.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Usage:
{{- $chartName := .context.Chart.Name }}

{{- $valuesPostgres := get .context.Values.global.postgres.master .key}}
{{- $secret := (lookup "v1" "Secret" "default" "gen3-postgresql" )}}
{{- $secret := (lookup "v1" "Secret" "default" "{{ .Release.Name }}-postgresql" )}}
{{- $devPostgresSecret := "" }}
{{- if $secret }}
{{- $devPostgresSecret = (index $secret "data" "postgres-password") | b64dec }}
Expand Down
4 changes: 2 additions & 2 deletions helm/gen3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Helm chart to deploy Gen3 Data Commons
| db_restore | bool | `false` | |
| fence.enabled | bool | `true` | |
| fence.image.repository | string | `nil` | |
| fence.image.tag | string | `nil` | |
| fence.image.tag | string | `"feat_dbenvvar"` | |
| global.aws.account | string | `nil` | |
| global.aws.enabled | bool | `false` | |
| global.dbRestoreBucket | string | `"gen3-dummy-data"` | |
Expand All @@ -84,7 +84,7 @@ Helm chart to deploy Gen3 Data Commons
| global.syncFromDbgap | bool | `false` | |
| global.tierAccessLevel | string | `"libre"` | |
| global.userYamlS3Path | string | `"s3://cdis-gen3-users/test/user.yaml"` | |
| guppy.enabled | bool | `true` | |
| guppy.enabled | bool | `false` | |
| guppy.image.repository | string | `nil` | |
| guppy.image.tag | string | `nil` | |
| hatchery.enabled | bool | `true` | |
Expand Down
4 changes: 2 additions & 2 deletions helm/gen3/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ fence:
enabled: true
image:
repository:
tag:
tag: feat_dbenvvar

guppy:
enabled: true
enabled: false
image:
repository:
tag:
Expand Down
1 change: 0 additions & 1 deletion helm/revproxy/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ Selector labels
app.kubernetes.io/name: {{ include "revproxy.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app: revproxy
#GEN3_DATE_LABEL
{{- end }}

{{/*
Expand Down
3 changes: 1 addition & 2 deletions helm/wts/templates/rolebinding.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
#WTS_BINDING
name: wts-role-binding
name: wts-role-binding-{{ .Release.Namespace}}
namespace: {{ $.Release.Namespace }}
subjects:
- kind: ServiceAccount
Expand Down