From 44f36c67c2c403b4f288aefb13a5c5b385768368 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 20 Dec 2023 10:55:41 +0000
Subject: [PATCH] Pull request #22: Feature/BUP-1156 open shift deployment
Merge in BUP/ozg-info-manager from feature/BUP-1156-open-shift-deployment to dev
---
gradle.properties | 2 +-
ozg-info-manager-interface/build.gradle | 4 ++--
.../src/main/helm/templates/ozg-info-manager-deployment.yaml | 2 +-
.../src/main/helm/templates/ozg-info-manager-ingress.yaml | 2 +-
ozg-info-manager-server/src/main/helm/values.yaml | 1 +
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 967e4a2..c19c3c9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ helmRepositorySnapshot=ozg-base-apps-snapshot
helmRepositoryRelease=ozg-base-apps
namespace=bup-ozg-ci
appName=ozg-info-manager
-mavenReleasesRepository=https://artifacts.mgm-tp.com/artifactory/bup-maven-releases/
\ No newline at end of file
+mavenReleasesRepository=https://nexus.ozg-sh.de/repository/ozg-snapshots/
diff --git a/ozg-info-manager-interface/build.gradle b/ozg-info-manager-interface/build.gradle
index fcbb1b7..2ed0e45 100644
--- a/ozg-info-manager-interface/build.gradle
+++ b/ozg-info-manager-interface/build.gradle
@@ -53,8 +53,8 @@ publishing {
maven {
url "${mavenReleasesRepository}"
credentials {
- username = "${repository_username}"
- password = "${repository_password}"
+ username = project.findProperty("repository_publish_username") ?: System.getenv('repository_publish_username')
+ password = project.findProperty("repository_publish_password") ?: System.getenv('repository_publish_password')
}
}
}
diff --git a/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-deployment.yaml b/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-deployment.yaml
index 7aacfa1..c65d89d 100644
--- a/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-deployment.yaml
+++ b/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
name: "{{ .Values.name }}-deployment"
labels:
- app: {{ .Values.name }}
+ app: "{{ .Values.name }}"
namespace: {{ .Values.global.namespace }}
spec:
replicas: 1
diff --git a/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-ingress.yaml b/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-ingress.yaml
index c4a5dc6..f359dc4 100644
--- a/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-ingress.yaml
+++ b/ozg-info-manager-server/src/main/helm/templates/ozg-info-manager-ingress.yaml
@@ -21,7 +21,7 @@ spec:
name: "{{ .Values.name }}-service"
port:
number: 8081
- host: "{{ .Values.global.namespace }}-{{ .Values.hostname }}.pidev.mgm-tp.com"
+ host: "{{ .Values.host }}"
# tls:
# - hosts:
# - hello.pidev.mgm-tp.com
diff --git a/ozg-info-manager-server/src/main/helm/values.yaml b/ozg-info-manager-server/src/main/helm/values.yaml
index e34db6d..3a4af46 100644
--- a/ozg-info-manager-server/src/main/helm/values.yaml
+++ b/ozg-info-manager-server/src/main/helm/values.yaml
@@ -1,5 +1,6 @@
name: "${appName}"
hostname: "${appName}"
+host: "${namespace}-${appName}.pidev.mgm-tp.com"
deployment:
image: "docker.ozg-sh.de/com.mgmtp.bup.ozg/${appName}"
tag: "${chartVersion}"
--
GitLab