From ebfd3fc5f3cf9f6633b9cfe7e6fbc50b19b9ff45 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 13 Jun 2023 11:09:29 +0200
Subject: [PATCH] fix deployment formatting, add jenkins gitops connection
---
Jenkinsfile | 70 ++++++++-----------------
src/main/helm/templates/deployment.yaml | 30 +++++------
2 files changed, 38 insertions(+), 62 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0118be4..1e84282 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -123,6 +123,23 @@ pipeline {
}
}
+ stage('Trigger Dev rollout') {
+ when {
+ branch 'master'
+ }
+ steps {
+ script {
+ FAILED_STAGE = env.STAGE_NAME
+
+ cloneGitopsRepo()
+
+ setNewDevAdapterVersion()
+
+ pushNewDevVersion()
+ }
+ }
+ }
+
stage ('OWASP Dependency-Check Vulnerabilities') {
when {
anyOf {
@@ -208,66 +225,25 @@ String getElementAccessToken() {
}
Void setNewDevAdapterVersion() {
- setNewAfmAdapterVersion('dev')
- setNewFsAdapterVersion('dev')
- setNewFormcycleAdapterVersion('dev')
- setNewXtaAdapterVersion('dev')
+ setNewOzgOperatorVersion('dev')
}
Void setNewTestAdapterVersion() {
- setNewAfmAdapterVersion('test')
- setNewFsAdapterVersion('test')
- setNewFormcycleAdapterVersion('test')
+ setNewOzgOperatorVersion('test')
}
-Void setNewAfmAdapterVersion(String environment) {
+Void setNewOzgOperatorVersion(String environment) {
dir("gitops") {
- def envFile = "${environment}/application/values/afm-adapter-values.yaml"
+ def envFile = "${environment}/application/values/ozg-operator-values.yaml"
def envVersions = readYaml file: envFile
- envVersions.afm_adapter.image.tag = IMAGE_TAG
- envVersions.afm_adapter.helm.version = HELM_CHART_VERSION
+ envVersions.ozg-operator.image.tag = IMAGE_TAG
+ envVersions.ozg-operator.helm.version = HELM_CHART_VERSION
writeYaml file: envFile, data: envVersions, overwrite: true
}
}
-Void setNewFsAdapterVersion(String environment) {
- dir("gitops") {
- def envFile = "${environment}/application/values/fs-adapter-values.yaml"
- def envVersions = readYaml file: envFile
-
- envVersions.fs_adapter.image.tag = IMAGE_TAG
- envVersions.fs_adapter.helm.version = HELM_CHART_VERSION
-
- writeYaml file: envFile, data: envVersions, overwrite: true
- }
-}
-
-Void setNewFormcycleAdapterVersion(String environment) {
- dir("gitops") {
- def envFile = "${environment}/application/values/formcycle-adapter-values.yaml"
- def envVersions = readYaml file: envFile
-
- envVersions.formcycle_adapter.image.tag = IMAGE_TAG
- envVersions.formcycle_adapter.helm.version = HELM_CHART_VERSION
-
- writeYaml file: envFile, data: envVersions, overwrite: true
- }
-}
-
-Void setNewXtaAdapterVersion(String environment) {
- dir("gitops") {
- def envFile = "${environment}/application/values/xta-adapter-values.yaml"
- def envVersions = readYaml file: envFile
-
- envVersions.xta_adapter.image.tag = IMAGE_TAG
- envVersions.xta_adapter.helm.version = HELM_CHART_VERSION
-
- writeYaml file: envFile, data: envVersions, overwrite: true
- }
-}
-
Void pushNewDevVersion() {
pushNewGitopsVersion('dev')
}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index ff1d4d9..f53ba40 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -53,33 +53,33 @@ spec:
{{- end }}
imagePullPolicy: Always
readinessProbe:
- failureThreshold: 3
- httpGet:
+ failureThreshold: 3
+ httpGet:
path: /actuator/health/readiness
port: 8081
scheme: HTTP
- periodSeconds: 10
- successThreshold: 1
- timeoutSeconds: 3
+ periodSeconds: 10
+ successThreshold: 1
+ timeoutSeconds: 3
startupProbe:
- failureThreshold: 10
- httpGet:
+ failureThreshold: 10
+ httpGet:
path: /actuator/health/readiness
port: 8081
scheme: HTTP
- initialDelaySeconds: 30
- periodSeconds: 5
- successThreshold: 1
- timeoutSeconds: 5
+ initialDelaySeconds: 30
+ periodSeconds: 5
+ successThreshold: 1
+ timeoutSeconds: 5
resources:
{{- with .Values.resources }}
{{ toYaml . | indent 10 }}
{{- end }}
securityContext:
- allowPrivilegeEscalation: false
- privileged: false
- readOnlyRootFilesystem: false
- runAsNonRoot: false
+ allowPrivilegeEscalation: false
+ privileged: false
+ readOnlyRootFilesystem: false
+ runAsNonRoot: false
stdin: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
--
GitLab