Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
31283845
Commit
31283845
authored
2 years ago
by
Dominik Hebeler
Browse files
Options
Downloads
Patches
Plain Diff
fixed helm release name max length to 53 characters
parent
86ec443c
No related branches found
Branches containing commit
No related tags found
1 merge request
!1979
Resolve "Implement Prometheus export for fpm status"
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+37
-37
37 additions, 37 deletions
.gitlab-ci.yml
chart/templates/_helpers.tpl
+4
-4
4 additions, 4 deletions
chart/templates/_helpers.tpl
with
41 additions
and
41 deletions
.gitlab-ci.yml
+
37
−
37
View file @
31283845
variables
:
DOCKER_HOST
:
"
tcp://docker-dind.gitlab-suma:2375"
BUILD_DOCKER_IMAGE
:
docker:20.10.15
DEPLOY_KUBERNETES_IMAGE
:
alpine/k8s:1.22.6
DOCKER_FPM_IMAGE_NAME
:
fpm
DOCKER_NGINX_IMAGE_NAME
:
nginx
DOCKER_NODE_IMAGE_NAME
:
node
DOCKER_HOST
:
"
tcp://docker-dind.gitlab-suma:2375"
BUILD_DOCKER_IMAGE
:
docker:20.10.15
DEPLOY_KUBERNETES_IMAGE
:
alpine/k8s:1.22.6
DOCKER_FPM_IMAGE_NAME
:
fpm
DOCKER_NGINX_IMAGE_NAME
:
nginx
DOCKER_NODE_IMAGE_NAME
:
node
workflow
:
rules
:
-
if
:
$CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" && ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH)
variables
:
APP_URL
:
"
https://${DOCKER_IMAGE_TAG_PREFIX}.review.metager.de"
APP_ENV
:
development
DOCKER_IMAGE_TAG_PREFIX
:
$CI_COMMIT_REF_SLUG
DOCKER_COMPOSER_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA
DOCKER_FPM_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NGINX_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NODE_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
HELM_RELEASE_NAME
:
review-$DOCKER_IMAGE_TAG_PREFIX
-
if
:
$CI_COMMIT_BRANCH == "master"
variables
:
APP_URL
:
https://metager.de
APP_ENV
:
production
DOCKER_IMAGE_TAG_PREFIX
:
$CI_COMMIT_BRANCH
DOCKER_COMPOSER_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA
DOCKER_FPM_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NGINX_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NODE_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
HELM_RELEASE_NAME
:
$DOCKER_IMAGE_TAG_PREFIX
-
if
:
$CI_COMMIT_BRANCH == "development"
variables
:
APP_URL
:
https://metager3.de
APP_ENV
:
development
DOCKER_IMAGE_TAG_PREFIX
:
$CI_COMMIT_BRANCH
DOCKER_COMPOSER_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA
DOCKER_FPM_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NGINX_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NODE_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
HELM_RELEASE_NAME
:
$DOCKER_IMAGE_TAG_PREFIX
-
if
:
$CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" && ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH)
variables
:
APP_URL
:
"
https://${DOCKER_IMAGE_TAG_PREFIX}.review.metager.de"
APP_ENV
:
development
DOCKER_IMAGE_TAG_PREFIX
:
$CI_COMMIT_REF_SLUG
DOCKER_COMPOSER_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA
DOCKER_FPM_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NGINX_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NODE_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
HELM_RELEASE_NAME
:
review-$
{
DOCKER_IMAGE_TAG_PREFIX
:0:46}
-
if
:
$CI_COMMIT_BRANCH == "master"
variables
:
APP_URL
:
https://metager.de
APP_ENV
:
production
DOCKER_IMAGE_TAG_PREFIX
:
$CI_COMMIT_BRANCH
DOCKER_COMPOSER_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA
DOCKER_FPM_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NGINX_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NODE_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
HELM_RELEASE_NAME
:
$
{
DOCKER_IMAGE_TAG_PREFIX
:0:53}
-
if
:
$CI_COMMIT_BRANCH == "development"
variables
:
APP_URL
:
https://metager3.de
APP_ENV
:
development
DOCKER_IMAGE_TAG_PREFIX
:
$CI_COMMIT_BRANCH
DOCKER_COMPOSER_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA
DOCKER_FPM_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NGINX_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
DOCKER_NODE_IMAGE_TAG
:
$DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
HELM_RELEASE_NAME
:
$
{
DOCKER_IMAGE_TAG_PREFIX
:0:53}
stages
:
-
build_dependency_images
...
...
@@ -51,4 +51,4 @@ include:
-
local
:
/.gitlab/ci/build_dependencies.yml
-
local
:
/.gitlab/ci/build_docker_images.yml
-
local
:
/.gitlab/ci/deploy.yml
-
local
:
/.gitlab/ci/integrationtest.yml
\ No newline at end of file
-
local
:
/.gitlab/ci/integrationtest.yml
This diff is collapsed.
Click to expand it.
chart/templates/_helpers.tpl
+
4
−
4
View file @
31283845
...
...
@@ -2,7 +2,7 @@
Expand
the
name
of
the
chart
.
*/
}}
{{- define "chart.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc
5
3 | trimSuffix "-" }}
{{- default .Chart.Name .Values.nameOverride | trunc
6
3 | trimSuffix "-" }}
{{- end }}
{
{
/*
...
...
@@ -12,9 +12,9 @@ If release name contains chart name it will be used as a full name.
*/
}
}
{{- define "chart.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc
5
3 | trimSuffix "-" }}
{{- .Values.fullnameOverride | trunc
6
3 | trimSuffix "-" }}
{{- else }}
{{- .Release.Name | trunc
5
3 | trimSuffix "-" }}
{{- .Release.Name | trunc
6
3 | trimSuffix "-" }}
{{- end }}
{{- end }}
...
...
@@ -22,7 +22,7 @@ If release name contains chart name it will be used as a full name.
Create
chart
name
and
version
as
used
by
the
chart
label
.
*/
}
}
{{- define "chart.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc
5
3 | trimSuffix "-" }}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc
6
3 | trimSuffix "-" }}
{{- end }}
{
{
/*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment