diff --git a/gradle.properties b/gradle.properties index 967e4a24962829e283dadb1d881bc238ea4b27ee..c19c3c907ca5a4d6eb6bfdd03ab63cf74a1603c0 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 fcbb1b78642e961ed95404a68b49e0d0fbc464db..2ed0e45adffa80f8dc435a866866b8e54d0d0ae9 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 7aacfa1229805de55dc114d6bf3552c5e6fbcf2e..c65d89db3c03ab51e38eea77db8f912376be1640 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 c4a5dc6205b15db546ff52e00990962fc6c58b0d..f359dc44c68f035f96b4262d16fc414ec7f2d408 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 e34db6dd36a61defc7f7cc39d9c3e9895ea25a9a..3a4af462c41ab551f7ec599d921f318463ad7a61 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}"