diff --git a/Jenkinsfile b/Jenkinsfile index 282694844b736b2611fe88fcfc28fd005de9b1c7..e5fa25e02c52c2f4d85f40c47c72b957888bf4c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,9 +74,9 @@ pipeline { } environment { - APP_NAME = 'eclipsefdn-mailing-list-api' + APP_NAME = 'eclipsefdn-mailing-lists-api' NAMESPACE = 'foundation-internal-webdev-apps' - IMAGE_NAME = 'eclipsefdn/eclipsefdn-mailing-list-api' + IMAGE_NAME = 'eclipsefdn/eclipsefdn-mailing-lists-api' CONTAINER_NAME = 'api' ENVIRONMENT = sh( script: """ diff --git a/src/main/k8s/staging.yml b/src/main/k8s/staging.yml index 6fea98825287e8b8953576725e7a726cfd4d8bc9..f7c1461bc1ca21564790f4dac41a0396a70c887f 100644 --- a/src/main/k8s/staging.yml +++ b/src/main/k8s/staging.yml @@ -1,21 +1,21 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: eclipsefdn-mailing-list-api-staging + name: eclipsefdn-mailing-lists-api-staging namespace: foundation-internal-webdev-apps labels: - app: eclipsefdn-mailing-list-api + app: eclipsefdn-mailing-lists-api environment: staging spec: selector: matchLabels: - app: eclipsefdn-mailing-list-api + app: eclipsefdn-mailing-lists-api environment: staging replicas: 2 template: metadata: labels: - app: eclipsefdn-mailing-list-api + app: eclipsefdn-mailing-lists-api environment: staging spec: affinity: @@ -30,7 +30,7 @@ spec: weight: 1 containers: - name: api - image: eclipsefdn/eclipsefdn-mailing-list-api:latest + image: eclipsefdn/eclipsefdn-mailing-lists-api:latest imagePullPolicy: Always ports: - containerPort: 8090 @@ -43,20 +43,20 @@ spec: memory: 256Mi env: - name: CONFIG_SECRET_PATH - value: "/run/secrets/mailing-list-api/secret.properties" + value: "/run/secrets/mailing-lists-api/secret.properties" volumeMounts: - name: secret-properties - mountPath: "/run/secrets/mailing-list-api" + mountPath: "/run/secrets/mailing-lists-api" readOnly: true volumes: - name: secret-properties secret: - secretName: mailing-list-api-app-staging + secretName: mailing-lists-api-app-staging --- apiVersion: "v1" kind: "Service" metadata: - name: eclipsefdn-mailing-list-api-staging + name: eclipsefdn-mailing-lists-api-staging namespace: foundation-internal-webdev-apps spec: ports: @@ -65,13 +65,13 @@ spec: protocol: "TCP" targetPort: 8090 selector: - app: eclipsefdn-mailing-list-api + app: eclipsefdn-mailing-lists-api environment: staging --- apiVersion: "route.openshift.io/v1" kind: "Route" metadata: - name: eclipsefdn-mailing-list-api-staging + name: eclipsefdn-mailing-lists-api-staging namespace: foundation-internal-webdev-apps annotations: haproxy.router.openshift.io/timeout: 20s @@ -87,5 +87,5 @@ spec: termination: "edge" to: kind: "Service" - name: eclipsefdn-mailing-list-api-staging + name: eclipsefdn-mailing-lists-api-staging weight: 100