Skip to content
Snippets Groups Projects
Commit c1ce7ded authored by Kalin Daskalov's avatar Kalin Daskalov
Browse files

Merge branch 'update-tag' into 'main' 

Add automatic tag fetching from remote repo

See merge request !6
parents 8ba577dd e2e69742
No related branches found
No related tags found
1 merge request!6Add automatic tag fetching from remote repo
Pipeline #68904 waiting for manual action
Stage: test
Stage: getinfo
Stage: build
Stage: manifest
Stage: lint
Stage: package
Stage: deploy
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 13
− 6
View file @ c1ce7ded
...@@ -4,9 +4,12 @@ variables: ...@@ -4,9 +4,12 @@ variables:
HELM_HELPERS_FILE: helm-eclipse.yml HELM_HELPERS_FILE: helm-eclipse.yml
APP_HELM_NAME: cache APP_HELM_NAME: cache
DOCKER_FILE: app/deployment/ci/Dockerfile DOCKER_FILE: app/deployment/ci/Dockerfile
GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_UPDATE_FLAGS: --remote --init --recursive
stages: stages:
- test - test
- getinfo
- build - build
- manifest - manifest
- lint - lint
...@@ -15,11 +18,10 @@ stages: ...@@ -15,11 +18,10 @@ stages:
include: include:
- project: "${HELPERS_PATH}" - project: "${HELPERS_PATH}"
file: 'build-eclipse.yml' file: "build-eclipse.yml"
- template: "Workflows/Branch-Pipelines.gitlab-ci.yml" - template: "Workflows/Branch-Pipelines.gitlab-ci.yml"
- project: "${HELPERS_PATH}" - project: "${HELPERS_PATH}"
file: 'helm-eclipse.yml' file: "helm-eclipse.yml"
lint: lint:
image: golangci/golangci-lint:latest image: golangci/golangci-lint:latest
...@@ -34,7 +36,7 @@ lint: ...@@ -34,7 +36,7 @@ lint:
- cd /go/src/gitlab.com/${CI_PROJECT_PATH}/app - cd /go/src/gitlab.com/${CI_PROJECT_PATH}/app
unit tests: unit tests:
image: golang:1.21.3 image: golang:1.21.5
stage: test stage: test
tags: tags:
- amd64-docker - amd64-docker
...@@ -48,7 +50,7 @@ unit tests: ...@@ -48,7 +50,7 @@ unit tests:
coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/' coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
govulncheck: govulncheck:
image: golang:1.21.3 image: golang:1.21.5
stage: test stage: test
tags: tags:
- amd64-docker - amd64-docker
...@@ -60,6 +62,11 @@ govulncheck: ...@@ -60,6 +62,11 @@ govulncheck:
- go install golang.org/x/vuln/cmd/govulncheck@latest - go install golang.org/x/vuln/cmd/govulncheck@latest
- govulncheck ./... - govulncheck ./...
check_commit:
extends: .check_commit
stage: getinfo
tags:
- amd64-docker
amd64: amd64:
extends: .docker-build extends: .docker-build
stage: build stage: build
...@@ -67,7 +74,7 @@ amd64: ...@@ -67,7 +74,7 @@ amd64:
- amd64-docker - amd64-docker
manifest: manifest:
extends: .manifest-amd64 extends: .manifest
stage: manifest stage: manifest
cloud: cloud:
......
Chart.yaml
+ 2
− 2
View file @ c1ce7ded
apiVersion: v1 apiVersion: v1
appVersion: v2.0.3 appVersion: v1.1.0
description: cache deployment description: cache deployment
name: cache name: cache
version: 2.0.3 version: 1.1.0
icon: "https://www.vereign.com/wp-content/themes/vereign2020/images/vereign-logo.svg" icon: "https://www.vereign.com/wp-content/themes/vereign2020/images/vereign-logo.svg"
README.md
+ 59
− 56
View file @ c1ce7ded
# cache ![GitLab tag (self-managed)](https://img.shields.io/gitlab/v/tag/eclipse%2Fxfsc%2Ftsa%2Fcache?gitlab_url=https%3A%2F%2Fgitlab.eclipse.org&logo=gitlab&label=Latest%20Eclipse%20Tag)
![GitLab tag (self-managed)](https://img.shields.io/gitlab/v/tag/gaiax%2Ftsa%2Fcache-helm?gitlab_url=https%3A%2F%2Fcode.vereign.com&logo=gitlab&label=Latest%20Local%20Tag&labelColor=grey&color=orange)
![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: v1.0.1-rc](https://img.shields.io/badge/AppVersion-v1.0.1--rc-informational?style=flat-square) # cache
## Deployment ## Deployment
...@@ -9,63 +11,64 @@ The pipeline in this repo builds image from the source code repo in eclipse as a ...@@ -9,63 +11,64 @@ The pipeline in this repo builds image from the source code repo in eclipse as a
### From main branch ### From main branch
When changes to helm or the app are made and deployment is needed, execute the following steps: When changes to helm or the app are made and deployment is needed, execute the following steps:
1. Clone the repo and start working on a new branch.
2. Execute `git submode update --remote --recursive -init` to update source to latest commit on eclipse main branch.
1. Edit `Chart.yaml` with the new chart version (example: 1.4.3) and app version it's intended to use (example: v1.4.3). 1. Edit `Chart.yaml` with the new chart version (example: 1.4.3) and app version it's intended to use (example: v1.4.3).
2. Create a new tag with the intended app version (v1.4.3) 2. Create merge request from the update branch.
3. Wait for pipelines to finish and manually trigger deployment to either `dev-ssi` or `prod-ssi(vault)` clusters. 3. Create a new tag from main branch with the intended chart version (1.4.3)
4. Wait for pipelines to finish and manually trigger deployment to either `dev-ssi` or `prod-ssi(vault)` clusters.
## Values ## Values
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| | ----------------------------------------------------------------- | ------ | ---------------------------------- | -------------------------------------------------------------- |
| autoscaling.enabled | bool | `false` | Enable autoscaling | | autoscaling.enabled | bool | `false` | Enable autoscaling |
| autoscaling.maxReplicas | int | `3` | Maximum replicas | | autoscaling.maxReplicas | int | `3` | Maximum replicas |
| autoscaling.minReplicas | int | `1` | Minimum replicas | | autoscaling.minReplicas | int | `1` | Minimum replicas |
| autoscaling.targetCPUUtilizationPercentage | int | `70` | CPU target for autoscaling trigger | | autoscaling.targetCPUUtilizationPercentage | int | `70` | CPU target for autoscaling trigger |
| autoscaling.targetMemoryUtilizationPercentage | int | `70` | Memory target for autoscaling trigger | | autoscaling.targetMemoryUtilizationPercentage | int | `70` | Memory target for autoscaling trigger |
| cache.http.host | string | `""` | | | cache.http.host | string | `""` | |
| cache.http.port | int | `8080` | | | cache.http.port | int | `8080` | |
| cache.http.timeout.idle | string | `"120s"` | | | cache.http.timeout.idle | string | `"120s"` | |
| cache.http.timeout.read | string | `"10s"` | | | cache.http.timeout.read | string | `"10s"` | |
| cache.http.timeout.write | string | `"10s"` | | | cache.http.timeout.write | string | `"10s"` | |
| cache.nats.subject | string | `"external_cache_events"` | | | cache.nats.subject | string | `"external_cache_events"` | |
| cache.nats.url | string | `"nats.ocm:4222"` | | | cache.nats.url | string | `"nats.ocm:4222"` | |
| image.name | string | `"gaiax/cache"` | Image name | | image.name | string | `"gaiax/cache"` | Image name |
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.pullSecrets | string | `"deployment-key-light"` | Image pull secret when internal image is used | | image.pullSecrets | string | `"deployment-key-light"` | Image pull secret when internal image is used |
| image.repository | string | `"eu.gcr.io/vrgn-infra-prj"` | | | image.repository | string | `"eu.gcr.io/vrgn-infra-prj"` | |
| image.sha | string | `""` | Image sha, usually generated by the CI Uses image.tag if empty | | image.sha | string | `""` | Image sha, usually generated by the CI Uses image.tag if empty |
| image.tag | string | `""` | Image tag Uses .Chart.AppVersion if empty | | image.tag | string | `""` | Image tag Uses .Chart.AppVersion if empty |
| ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-production-http"` | | | ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-production-http"` | |
| ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` | | | ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` | |
| ingress.annotations."kubernetes.io/ingress.global-static-ip-name" | string | `"dev-light-public"` | | | ingress.annotations."kubernetes.io/ingress.global-static-ip-name" | string | `"dev-light-public"` | |
| ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` | | | ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` | |
| ingress.enabled | bool | `true` | | | ingress.enabled | bool | `true` | |
| ingress.frontendDomain | string | `"gaiax.vereign.com"` | | | ingress.frontendDomain | string | `"gaiax.vereign.com"` | |
| ingress.frontendTlsSecretName | string | `"cert-manager-tls"` | | | ingress.frontendTlsSecretName | string | `"cert-manager-tls"` | |
| ingress.tlsEnabled | bool | `true` | | | ingress.tlsEnabled | bool | `true` | |
| log.encoding | string | `"json"` | | | log.encoding | string | `"json"` | |
| log.level | string | `"debug"` | | | log.level | string | `"debug"` | |
| metrics.enabled | bool | `true` | Enable prometheus metrics | | metrics.enabled | bool | `true` | Enable prometheus metrics |
| metrics.port | int | `2112` | Port for prometheus metrics | | metrics.port | int | `2112` | Port for prometheus metrics |
| name | string | `"cache"` | Application name | | name | string | `"cache"` | Application name |
| nameOverride | string | `""` | Ovverwrites application name | | nameOverride | string | `""` | Ovverwrites application name |
| podAnnotations | object | `{}` | | | podAnnotations | object | `{}` | |
| redis.addr | string | `"redis-public-master.infra:6379"` | | | redis.addr | string | `"redis-public-master.infra:6379"` | |
| redis.db | int | `0` | | | redis.db | int | `0` | |
| redis.expiration | string | `"1h"` | | | redis.expiration | string | `"1h"` | |
| redis.pass | string | `""` | | | redis.pass | string | `""` | |
| redis.user | string | `""` | | | redis.user | string | `""` | |
| replicaCount | int | `1` | Default number of instances to start | | replicaCount | int | `1` | Default number of instances to start |
| resources.limits.cpu | string | `"150m"` | | | resources.limits.cpu | string | `"150m"` | |
| resources.limits.memory | string | `"128Mi"` | | | resources.limits.memory | string | `"128Mi"` | |
| resources.requests.cpu | string | `"25m"` | | | resources.requests.cpu | string | `"25m"` | |
| resources.requests.memory | string | `"64Mi"` | | | resources.requests.memory | string | `"64Mi"` | |
| security.runAsGid | int | `0` | Group used by the apps | | security.runAsGid | int | `0` | Group used by the apps |
| security.runAsNonRoot | bool | `false` | by default, apps run as non-root | | security.runAsNonRoot | bool | `false` | by default, apps run as non-root |
| security.runAsUid | int | `0` | User used by the apps | | security.runAsUid | int | `0` | User used by the apps |
| service.port | int | `8080` | | | service.port | int | `8080` | |
---
----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0) Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
app @ bf062b1d
Subproject commit 1bb0257b687bb2f015debedd0c4cdbb508a6012e Subproject commit bf062b1da4c3f7df413e1dd2f7e0e334c915c0f6
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment