feat: add gitlab related annotations when CI is gitlab

check for Chart.lock instead of requirements.lock
add .dockerignore

Signed-off-by: Siddharth Tiwari <[email protected]>

Author: o-c-e

.dockerignore

@@ -0,0 +1,5 @@
+.git*
+*.md
+LICENSE
+Dockerfile
+*ignore

auto-deploy

@@ -54,7 +54,7 @@ function download_chart() {
     cp -R "$ASSETS_CHART_DIR" chart
   fi
 
-  if [[ -f chart/requirements.lock ]]; then
+  if [[ -f chart/Chart.lock ]]; then
     helm dependency build chart/
   else
     helm dependency update chart/
@@ -101,6 +101,11 @@ function initialize_tiller() {
 
 function write_environment_values_file() {
 
+  export GITLAB_CI=${GITLAB_CI:-false}
+  if test "${GITLAB_CI}" == "true"; then
+    echo "gitlab: true" >"$AUTO_DEPLOY_ENVIRONMENT_VALUES_FILE"
+  fi
+
   # Helm 3 does not like `--set image.secrets[0]=""`
   if [[ "$CI_PROJECT_VISIBILITY" != "public" ]]; then
     echo "image: { secrets: [ { name: gitlab-registry-${CI_PROJECT_PATH_SLUG} } ] }" >>"$AUTO_DEPLOY_ENVIRONMENT_VALUES_FILE"
@@ -260,10 +265,10 @@ function deploy() {
       "${atomic_flag[@]}" \
       "${debug_flag[@]}" \
       --wait \
-      --set gitlab.app="$CI_PROJECT_PATH_SLUG" \
-      --set gitlab.env="$CI_ENVIRONMENT_SLUG" \
-      --set gitlab.envName="$CI_ENVIRONMENT_NAME" \
-      --set gitlab.envURL="$CI_ENVIRONMENT_URL" \
+      --set project.repo="$CI_PROJECT_PATH_SLUG" \
+      --set project.slug="$CI_ENVIRONMENT_SLUG" \
+      --set project.env="$CI_ENVIRONMENT_NAME" \
+      --set project.url="$CI_ENVIRONMENT_URL" \
       --set releaseOverride="$RELEASE_NAME" \
       --set image.repository="$image_repository" \
       --set-string image.tag="$image_tag" \
@@ -292,10 +297,10 @@ function deploy() {
     "${atomic_flag[@]}" \
     "${debug_flag[@]}" \
     --wait \
-    --set gitlab.app="$CI_PROJECT_PATH_SLUG" \
-    --set gitlab.env="$CI_ENVIRONMENT_SLUG" \
-    --set gitlab.envName="$CI_ENVIRONMENT_NAME" \
-    --set gitlab.envURL="$CI_ENVIRONMENT_URL" \
+    --set project.repo="$CI_PROJECT_PATH_SLUG" \
+    --set project.slug="$CI_ENVIRONMENT_SLUG" \
+    --set project.env="$CI_ENVIRONMENT_NAME" \
+    --set project.url="$CI_ENVIRONMENT_URL" \
     --set releaseOverride="$RELEASE_NAME" \
     --set image.repository="$image_repository" \
     --set-string image.tag="$image_tag" \
@@ -466,20 +471,20 @@ function get_replicas() {
 option=$1
 case $option in
 
-  check_kube_domain) check_kube_domain ;;
-  download_chart) download_chart ;;
-  ensure_namespace) ensure_namespace ;;
-  initialize_tiller) initialize_tiller ;;
-  create_secret) create_secret ;;
-  persist_environment_url) persist_environment_url ;;
-  auto_database_url) auto_database_url ;;
-  install_postgresql) install_postgresql "${@:2}" ;;
-  deploy) deploy "${@:2}" ;;
-  scale) scale "${@:2}" ;;
-  delete) delete "${@:2}" ;;
-  create_application_secret) create_application_secret "${@:2}" ;;
-  deploy_name) deploy_name "${@:2}" ;;
-  get_replicas) get_replicas "${@:2}" ;;
-  check_old_postgres_exist) check_old_postgres_exist ;;
-  *) exit 1 ;;
+check_kube_domain) check_kube_domain ;;
+download_chart) download_chart ;;
+ensure_namespace) ensure_namespace ;;
+initialize_tiller) initialize_tiller ;;
+create_secret) create_secret ;;
+persist_environment_url) persist_environment_url ;;
+auto_database_url) auto_database_url ;;
+install_postgresql) install_postgresql "${@:2}" ;;
+deploy) deploy "${@:2}" ;;
+scale) scale "${@:2}" ;;
+delete) delete "${@:2}" ;;
+create_application_secret) create_application_secret "${@:2}" ;;
+deploy_name) deploy_name "${@:2}" ;;
+get_replicas) get_replicas "${@:2}" ;;
+check_old_postgres_exist) check_old_postgres_exist ;;
+*) exit 1 ;;
 esac

chart/lambda/Chart.yaml

@@ -27,23 +27,17 @@ engine: gotpl
 home: https://github.com/opencloudengineer/lambda/tree/main/chart/lambda
 icon: https://helm.sh/img/helm.svg
 keywords:
-  - database
-  - mongodb
-  - nosql
-  - postgres
-  - mysql
-  - mariadb
-  - sql
-  - redis
-  - caching
+  - REST
+  - GraphQL
+  - gRPC
+  - deployments
+  - daemonsets
+  - statefulsets
 maintainers:
   - email: [email protected]
     name: opencloudengineer
 name: lambda
 sources:
-  - https://www.mysql.com/
-  - https://www.mongodb.com/
-  - https://www.postgresql.org/
-  - https://redis.io/
-  - https://mariadb.org/
+  - https://helm.sh/docs/topics/charts
+  - https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/tree/master/assets/auto-deploy-app
 version: 0.1.0

chart/lambda/README.md

@@ -29,7 +29,7 @@
 | service.annotations           | Service annotations | `{}`                       |
 | service.name                  |             | `web`                              |
 | service.type                  |             | `ClusterIP`                        |
-| service.url                   |             | `http://my.host.com/`              |
+| service.url                   |             | `http://app.namespace.cluster.local/`              |
 | service.additionalHosts       | If present, this list will add additional hostnames to the server configuration. | `nil` |
 | service.commonName            | If present, this will define the ssl certificate common name to be used by CertManager. `service.url` and `service.additionalHosts` will be added as Subject Alternative Names (SANs) | `nil` |
 | service.externalPort          |             | `5000`                             |

chart/lambda/templates/deployment.yaml

@@ -6,6 +6,8 @@ metadata:
   annotations:
     {{ if .Values.project.repo }}repo: {{ .Values.project.repo | quote }}{{ end }}
     {{ if .Values.project.slug }}slug: {{ .Values.project.slug | quote }}{{ end }}
+    {{ if .Values.gitlab }}app.gitlab.com/app: {{ .Values.project.repo | quote }}{{ end }}
+    {{ if .Values.gitlab }}app.gitlab.com/env: {{ .Values.project.slug | quote }}{{ end }}
   labels:
     app: {{ template "appname" . }}
     track: "{{ .Values.application.track }}"
@@ -31,6 +33,9 @@ spec:
         checksum/application-secrets: "{{ .Values.application.secretChecksum }}"
         {{ if .Values.project.repo }}repo: {{ .Values.project.repo | quote }}{{ end }}
         {{ if .Values.project.slug }}slug: {{ .Values.project.slug | quote }}{{ end }}
+        {{ if .Values.gitlab }}app.gitlab.com/app: {{ .Values.project.repo | quote }}{{ end }}
+        {{ if .Values.gitlab }}app.gitlab.com/env: {{ .Values.project.slug | quote }}{{ end }}
+
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
 {{- end }}

chart/lambda/templates/worker-deployment.yaml

@@ -10,6 +10,8 @@ items:
     annotations:
       {{ if $.Values.project.repo }}repo: {{ $.Values.project.repo | quote }}{{ end }}
       {{ if $.Values.project.slug }}slug: {{ $.Values.project.slug | quote }}{{ end }}
+      {{ if $.Values.gitlab }}app.gitlab.com/app: {{ $.Values.project.repo | quote }}{{ end }}
+      {{ if $.Values.gitlab }}app.gitlab.com/env: {{ $.Values.project.slug | quote }}{{ end }}
     labels:
       track: "{{ $.Values.application.track }}"
       tier: worker
@@ -33,6 +35,8 @@ items:
           checksum/application-secrets: "{{ $.Values.application.secretChecksum }}"
           {{ if $.Values.project.repo }}repo: {{ $.Values.project.repo | quote }}{{ end }}
           {{ if $.Values.project.slug }}slug: {{ $.Values.project.slug | quote }}{{ end }}
+          {{ if $.Values.gitlab }}app.gitlab.com/app: {{ $.Values.project.repo | quote }}{{ end }}
+          {{ if $.Values.gitlab }}app.gitlab.com/env: {{ $.Values.project.slug | quote }}{{ end }}
   {{- if $.Values.podAnnotations }}
   {{ toYaml $.Values.podAnnotations | indent 10 }}
   {{- end }}

chart/lambda/values.yaml

@@ -29,7 +29,7 @@ service:
   annotations: {}
   name: web
   type: ClusterIP
-  url: http://my.host.com/
+  url: http://app.namespace.cluster.local/
   additionalHosts:
   commonName:
   externalPort: 5000