No longer use nginx sidecontainers for infocenters
Make use of haproxy.router.openshift.io/rewrite-target annotation
instead.
Change-Id: I61c32423e3782dae2a29543b2d32943c9b729c80
Signed-off-by: Frederic Gurr <frederic.gurr@eclipse-foundation.org>
diff --git a/infoCenter/k8s/2019-06/deployment.yml b/infoCenter/k8s/2019-06/deployment.yml
index 93b1d64..e0b71f4 100644
--- a/infoCenter/k8s/2019-06/deployment.yml
+++ b/infoCenter/k8s/2019-06/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2019-06
diff --git a/infoCenter/k8s/2019-06/nginx-configmap.yml b/infoCenter/k8s/2019-06/nginx-configmap.yml
deleted file mode 100644
index 31d3459..0000000
--- a/infoCenter/k8s/2019-06/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2019-06"
- namespace: "infocenter"
- name: nginx-config-2019-06
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2019-06/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2019-06/route.yml b/infoCenter/k8s/2019-06/route.yml
index 19150d3..c58e511 100644
--- a/infoCenter/k8s/2019-06/route.yml
+++ b/infoCenter/k8s/2019-06/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2019-06"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2019-06/service.yml b/infoCenter/k8s/2019-06/service.yml
index 59f5fb6..20e08b2 100644
--- a/infoCenter/k8s/2019-06/service.yml
+++ b/infoCenter/k8s/2019-06/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2019-06"
diff --git a/infoCenter/k8s/2019-09/deployment.yml b/infoCenter/k8s/2019-09/deployment.yml
index 3e4d022..6cd7cae 100644
--- a/infoCenter/k8s/2019-09/deployment.yml
+++ b/infoCenter/k8s/2019-09/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2019-09
diff --git a/infoCenter/k8s/2019-09/nginx-configmap.yml b/infoCenter/k8s/2019-09/nginx-configmap.yml
deleted file mode 100644
index b7460f6..0000000
--- a/infoCenter/k8s/2019-09/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2019-09"
- namespace: "infocenter"
- name: nginx-config-2019-09
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2019-09/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2019-09/route.yml b/infoCenter/k8s/2019-09/route.yml
index 25edbae..4cea398 100644
--- a/infoCenter/k8s/2019-09/route.yml
+++ b/infoCenter/k8s/2019-09/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2019-09"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2019-09/service.yml b/infoCenter/k8s/2019-09/service.yml
index 6611141..d2105f7 100644
--- a/infoCenter/k8s/2019-09/service.yml
+++ b/infoCenter/k8s/2019-09/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2019-09"
diff --git a/infoCenter/k8s/2019-12/deployment.yml b/infoCenter/k8s/2019-12/deployment.yml
index 97c1a1d..c4f4030 100644
--- a/infoCenter/k8s/2019-12/deployment.yml
+++ b/infoCenter/k8s/2019-12/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2019-12
diff --git a/infoCenter/k8s/2019-12/nginx-configmap.yml b/infoCenter/k8s/2019-12/nginx-configmap.yml
deleted file mode 100644
index 8c99e05..0000000
--- a/infoCenter/k8s/2019-12/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2019-12"
- namespace: "infocenter"
- name: nginx-config-2019-12
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2019-12/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2019-12/route.yml b/infoCenter/k8s/2019-12/route.yml
index c31b451..42b41e7 100644
--- a/infoCenter/k8s/2019-12/route.yml
+++ b/infoCenter/k8s/2019-12/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2019-12"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2019-12/service.yml b/infoCenter/k8s/2019-12/service.yml
index dd9de14..c0d7064 100644
--- a/infoCenter/k8s/2019-12/service.yml
+++ b/infoCenter/k8s/2019-12/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2019-12"
diff --git a/infoCenter/k8s/2020-03/deployment.yml b/infoCenter/k8s/2020-03/deployment.yml
index 4657b78..3e4e4a0 100644
--- a/infoCenter/k8s/2020-03/deployment.yml
+++ b/infoCenter/k8s/2020-03/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2020-03
diff --git a/infoCenter/k8s/2020-03/nginx-configmap.yml b/infoCenter/k8s/2020-03/nginx-configmap.yml
deleted file mode 100644
index e8b7436..0000000
--- a/infoCenter/k8s/2020-03/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2020-03"
- namespace: "infocenter"
- name: nginx-config-2020-03
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2020-03/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2020-03/route.yml b/infoCenter/k8s/2020-03/route.yml
index dd35ed7..c4f9866 100644
--- a/infoCenter/k8s/2020-03/route.yml
+++ b/infoCenter/k8s/2020-03/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2020-03"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2020-03/service.yml b/infoCenter/k8s/2020-03/service.yml
index 0d40f40..5a0a52a 100644
--- a/infoCenter/k8s/2020-03/service.yml
+++ b/infoCenter/k8s/2020-03/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2020-03"
diff --git a/infoCenter/k8s/2020-06/deployment.yml b/infoCenter/k8s/2020-06/deployment.yml
index ab9abdb..e43c6f9 100644
--- a/infoCenter/k8s/2020-06/deployment.yml
+++ b/infoCenter/k8s/2020-06/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2020-06
diff --git a/infoCenter/k8s/2020-06/nginx-configmap.yml b/infoCenter/k8s/2020-06/nginx-configmap.yml
deleted file mode 100644
index 71399bc..0000000
--- a/infoCenter/k8s/2020-06/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2020-06"
- namespace: "infocenter"
- name: nginx-config-2020-06
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2020-06/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2020-06/route.yml b/infoCenter/k8s/2020-06/route.yml
index 4cbb0d1..f155026 100644
--- a/infoCenter/k8s/2020-06/route.yml
+++ b/infoCenter/k8s/2020-06/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2020-06"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2020-06/service.yml b/infoCenter/k8s/2020-06/service.yml
index 9be2fa3..652e163 100644
--- a/infoCenter/k8s/2020-06/service.yml
+++ b/infoCenter/k8s/2020-06/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2020-06"
diff --git a/infoCenter/k8s/2020-09/deployment.yml b/infoCenter/k8s/2020-09/deployment.yml
index c0ebbb5..16100f1 100644
--- a/infoCenter/k8s/2020-09/deployment.yml
+++ b/infoCenter/k8s/2020-09/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2020-09
diff --git a/infoCenter/k8s/2020-09/nginx-configmap.yml b/infoCenter/k8s/2020-09/nginx-configmap.yml
deleted file mode 100644
index c390572..0000000
--- a/infoCenter/k8s/2020-09/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2020-09"
- namespace: "infocenter"
- name: nginx-config-2020-09
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2020-09/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2020-09/route.yml b/infoCenter/k8s/2020-09/route.yml
index b3c9cc5..a94bee3 100644
--- a/infoCenter/k8s/2020-09/route.yml
+++ b/infoCenter/k8s/2020-09/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2020-09"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2020-09/service.yml b/infoCenter/k8s/2020-09/service.yml
index b343b05..2325c56 100644
--- a/infoCenter/k8s/2020-09/service.yml
+++ b/infoCenter/k8s/2020-09/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2020-09"
diff --git a/infoCenter/k8s/2020-12/deployment.yml b/infoCenter/k8s/2020-12/deployment.yml
index 3315b20..83b2c93 100644
--- a/infoCenter/k8s/2020-12/deployment.yml
+++ b/infoCenter/k8s/2020-12/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2020-12
diff --git a/infoCenter/k8s/2020-12/nginx-configmap.yml b/infoCenter/k8s/2020-12/nginx-configmap.yml
deleted file mode 100644
index 958b8e0..0000000
--- a/infoCenter/k8s/2020-12/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2020-12"
- namespace: "infocenter"
- name: nginx-config-2020-12
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2020-12/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2020-12/route.yml b/infoCenter/k8s/2020-12/route.yml
index e1a666f..f374bdf 100644
--- a/infoCenter/k8s/2020-12/route.yml
+++ b/infoCenter/k8s/2020-12/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2020-12"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2020-12/service.yml b/infoCenter/k8s/2020-12/service.yml
index 38f7a2d..467d230 100644
--- a/infoCenter/k8s/2020-12/service.yml
+++ b/infoCenter/k8s/2020-12/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2020-12"
diff --git a/infoCenter/k8s/2021-03/deployment.yml b/infoCenter/k8s/2021-03/deployment.yml
index e244812..2f83e7c 100644
--- a/infoCenter/k8s/2021-03/deployment.yml
+++ b/infoCenter/k8s/2021-03/deployment.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -70,17 +70,6 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: eclipsefdn/nginx:stable-alpine
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-2021-03
diff --git a/infoCenter/k8s/2021-03/nginx-configmap.yml b/infoCenter/k8s/2021-03/nginx-configmap.yml
deleted file mode 100644
index d9800d3..0000000
--- a/infoCenter/k8s/2021-03/nginx-configmap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
-# This program and the accompanying materials are made available
-# under the terms of the Eclipse Public License 2.0
-# which is available at http://www.eclipse.org/legal/epl-v20.html,
-# or the MIT License which is available at https://opensource.org/licenses/MIT.
-# SPDX-License-Identifier: EPL-2.0 OR MIT
-#*******************************************************************************
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "2021-03"
- namespace: "infocenter"
- name: nginx-config-2021-03
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /2021-03/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
diff --git a/infoCenter/k8s/2021-03/route.yml b/infoCenter/k8s/2021-03/route.yml
index 94fe17d..b5529cb 100644
--- a/infoCenter/k8s/2021-03/route.yml
+++ b/infoCenter/k8s/2021-03/route.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -14,6 +14,7 @@
namespace: "infocenter"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-2021-03"
spec:
host: "help.eclipse.org"
diff --git a/infoCenter/k8s/2021-03/service.yml b/infoCenter/k8s/2021-03/service.yml
index 6496ff7..2e63e79 100644
--- a/infoCenter/k8s/2021-03/service.yml
+++ b/infoCenter/k8s/2021-03/service.yml
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2019 Eclipse Foundation and others.
+# Copyright (c) 2021 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
@@ -18,6 +18,6 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "2021-03"
diff --git a/infoCenter/k8s/createInfoCenter_yaml.sh b/infoCenter/k8s/createInfoCenter_yaml.sh
index b1243b8..4c38587 100755
--- a/infoCenter/k8s/createInfoCenter_yaml.sh
+++ b/infoCenter/k8s/createInfoCenter_yaml.sh
@@ -19,8 +19,6 @@
sha_256="${2:-}"
namespace="infocenter"
hostname="help.eclipse.org"
-dockerhub_repo="eclipsecbi/eclipse-infocenter"
-nginx_image="eclipsefdn/nginx:stable-alpine"
# Verify inputs
if [[ -z "${release_name}" ]]; then
@@ -35,7 +33,7 @@
create_license_header() {
local file="${1:-}"
- local year="2019"
+ local year="2021"
cat <<EOF > ${file}
#*******************************************************************************
# Copyright (c) ${year} Eclipse Foundation and others.
@@ -63,6 +61,7 @@
namespace: "${namespace_name}"
annotations:
haproxy.router.openshift.io/timeout: 60s
+ haproxy.router.openshift.io/rewrite-target: /help
name: "infocenter-${release_name}"
spec:
host: "${host_name}"
@@ -97,54 +96,19 @@
- name: "http"
port: 80
protocol: "TCP"
- targetPort: 8080
+ targetPort: 8086
selector:
infocenter.version: "${release_name}"
EOF
}
-create_nginx_configmap () {
- local release_name="${1:-}"
- local namespace_name="${2:-}"
- local file_name="${release_name}/nginx-configmap.yml"
- create_license_header "${file_name}"
- cat <<EOF >> ${file_name}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- labels:
- infocenter.version: "${release_name}"
- namespace: "${namespace_name}"
- name: nginx-config-${release_name}
-data:
- nginx.conf: |-
- worker_processes 1;
- error_log /var/log/nginx/error.log warn;
- pid /var/run/nginx.pid;
- events {
- worker_connections 1024;
- }
- http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
- sendfile on;
- keepalive_timeout 65;
- server {
- listen 8080;
- location /${release_name}/ {
- proxy_pass http://127.0.0.1:8086/help/;
- }
- }
- }
-EOF
-}
-
create_deployment () {
local release_name="${1:-}"
local namespace_name="${2:-}"
local sha256="${3:-}"
#local sha256="$(docker inspect --format='{{index .RepoDigests 0}}' "${dockerhub_repo}:${release_name}" | sed -E 's/.*sha256:(.*)/\1/g')"
local file_name="${release_name}/deployment.yml"
+ local dockerhub_repo="eclipsecbi/eclipse-infocenter"
local infocenter_image="${dockerhub_repo}:${release_name}@sha256:${sha256}"
echo "Image name: ${infocenter_image}"
@@ -214,26 +178,14 @@
volumeMounts:
- name: workspace
mountPath: "/infocenter/workspace"
- - name: nginx
- image: ${nginx_image}
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: nginx-config
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
volumes:
- name: workspace
emptyDir: {}
- - name: nginx-config
- configMap:
- name: nginx-config-${release_name}
EOF
}
mkdir -p "${release_name}"
create_route "${release_name}" "${namespace}" "${hostname}"
create_service "${release_name}" "${namespace}"
-create_nginx_configmap "${release_name}" "${namespace}"
create_deployment "${release_name}" "${namespace}" "${sha_256}"
diff --git a/infoCenter/k8s/deployInfoCenter.sh b/infoCenter/k8s/deployInfoCenter.sh
index 2d34fc1..2a6c5b9 100755
--- a/infoCenter/k8s/deployInfoCenter.sh
+++ b/infoCenter/k8s/deployInfoCenter.sh
@@ -18,14 +18,11 @@
release_name=${1:-}
# Verify inputs
-if [[ -z "${release_name}" && $# -lt 1 ]]; then
+if [[ -z "${release_name}" ]]; then
printf "ERROR: a release name must be given.\n"
exit 1
fi
oc apply -f "${release_name}/route.yml"
oc apply -f "${release_name}/service.yml"
-oc apply -f "${release_name}/nginx-configmap.yml"
oc apply -f "${release_name}/deployment.yml"
-oc delete pod "infocenter-${release_name}-0" -n infocenter --force --grace-period=0
-
