From c58e520c9bc3cd6e0e8f9cb945cbc849e65f602d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 25 Oct 2024 16:29:06 +0200
Subject: [PATCH] ozg-6747 cleanup
---
config/config-production.yml | 2 +-
internal/config/config.go | 1 -
src/main/helm/templates/deployment.yaml | 2 +-
src/main/helm/values.yaml | 6 +-----
src/test/helm/deployment_env_test.yaml | 13 +------------
5 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/config/config-production.yml b/config/config-production.yml
index fbfedf2..06bfbda 100755
--- a/config/config-production.yml
+++ b/config/config-production.yml
@@ -1,6 +1,6 @@
http:
server:
- port: 8083
+ port: 8082
grpc:
server:
mock: false
diff --git a/internal/config/config.go b/internal/config/config.go
index 8eb97bb..49ecde6 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -66,7 +66,6 @@ func LoadConfig(configFilePath ...string) Config {
if env == "" {
env = defaultEnv
}
- fmt.Printf("APP_ENV: %v\n", env)
fp := fmt.Sprintf("config/config-%s.yml", env)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index b4a6d8c..e61b330 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -59,7 +59,7 @@ spec:
containers:
- env:
- name: GRPC_SERVER_PORT
- value: "{{ ((.Values.grpc).server).port }}"
+ value: "9090"
- name: APP_ENV
value: "production"
{{- with include "app.getCustomList" . }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 759391b..7bedbf1 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -29,8 +29,4 @@ replicaCount: 1
image:
repo: docker.ozg-sh.de
name: antragraum-proxy
- tag: latest # [default: latest]
-
-grpc:
- server:
- port: 9090
\ No newline at end of file
+ tag: latest # [default: latest]
\ No newline at end of file
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index 885ca83..951e6b2 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -74,15 +74,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: APP_ENV
- value: "production"
- - it: check set envs
- set:
- grpc:
- server:
- port: 9091
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: GRPC_SERVER_PORT
- value: "9091"
\ No newline at end of file
+ value: "production"
\ No newline at end of file
--
GitLab