Simplified init container and other changes based on code review sugg…

…estions.

Signed-off-by: Kevin Mellott <[email protected]>
Co-authored-by: Kevin Mellott <[email protected]>

.github/workflows/lint-test-chart.yaml → .github/workflows/test-chart.yaml

@@ -1,4 +1,4 @@
-name: Lint and Test Chart
+name: test-chart
 
 on:
  pull_request:

.gitignore

@@ -4,6 +4,7 @@
 *.swp
 ./**/*.class
 ./out/*
+.actrc
 .DS_Store
 .classpath
 .editorconfig

CONTRIBUTING.md

@@ -62,13 +62,23 @@ To setup the git hook scripts run:
 $ pre-commit install
 ```
 
-# GitHub Actions
+# `.github/workflows`
 
 Each Pull Request executes a series of quality checks, mostly relying upon CircleCI for validation. However, there are
 certain validation checks that execute via GitHub Actions and can be run locally using the steps below.
 
 Install [act](https://github.com/nektos/act) and run the following command, which will evaluate the GitHub Actions 
-checks that apply to each Pull Request.
+checks that apply to each Pull Request. The first time you run _act_ you will be asked to choose a
+[runner](https://github.com/nektos/act#runners).
+
+Alternatively, you can store your preferred runner within a local user profile named _.actrc_.
+
+```bash
+# .actrc file example (https://github.com/nektos/act#configuration)
+-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest
+```
+
+Once you have configured a runner, use _act_ to invoke GitHub Actions and evaluate the workflow.
 
 ```bash
 act pull_request

chart/templates/marquez/deployment.yaml

@@ -24,48 +24,18 @@ spec:
  # This init container is for avoiding CrashLoopback errors in the Marquez container because the PostgreSQL container is not ready
  initContainers:
  - name: wait-for-db
- image: {{ include "common.images.image" (dict "imageRoot" .Values.postgresql.image "global" .Values.global) }}
- imagePullPolicy: {{ .Values.postgresql.image.pullPolicy }}
+ image: postgres:12.1
+ imagePullPolicy: IfNotPresent
  command:
  - /bin/bash
  args:
  - -ec
- - |
- #!/bin/bash
-
- set -o errexit
- set -o nounset
- set -o pipefail
-
- . /opt/bitnami/scripts/libos.sh
- . /opt/bitnami/scripts/liblog.sh
- . /opt/bitnami/scripts/libpostgresql.sh
-
- check_postgresql_connection() {
- echo "SELECT 1" | postgresql_remote_execute "$POSTGRES_HOST" "$POSTGRES_PORT" "$POSTGRES_DB" "$POSTGRES_USER" "$POSTGRES_PASSWORD"
- }
-
- info "Connecting to the PostgreSQL instance $POSTGRES_HOST:$POSTGRES_PORT"
- if ! retry_while "check_postgresql_connection"; then
- error "Could not connect to the database server"
- return 1
- else
- info "Connected to the PostgreSQL instance"
- fi
+ - until pg_isready -h ${POSTGRES_HOST} -p ${POSTGRES_PORT}; do echo waiting for database; sleep 2; done;
  env:
  - name: POSTGRES_HOST
  value: {{ include "marquez.database.host" . | quote }}
  - name: POSTGRES_PORT
  value: {{ include "marquez.database.port" . | quote }}
- - name: POSTGRES_DB
- value: {{ include "marquez.database.name" . | quote }}
- - name: POSTGRES_USER
- value: {{ include "marquez.database.user" . | quote }}
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ include "marquez.postgresql.secretName" . }}
- key: {{ include "marquez.database.existingsecret.key" . }}
  {{- end }}
  containers:
  - name: {{ .Chart.Name }}

chart/values.yaml

@@ -96,6 +96,16 @@ postgresql:
  ## @param postgresql.enabled Deploy PostgreSQL container(s)
  ##
  enabled: false
+ ## Bitnami PostgreSQL image version
+ ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
+ ## @param image.registry PostgreSQL image registry
+ ## @param image.repository PostgreSQL image repository
+ ## @param image.tag PostgreSQL image tag (immutable tags are recommended)
+ ##
+ image:
+ registry: docker.io
+ repository: bitnami/postgresql
+ tag: 12.1.0
  ## @param postgresql.postgresqlUsername PostgreSQL username
  ## ref: https://hub.docker.com/_/postgres/
  ##