Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Kubernetes #88

Merged
merged 11 commits into from
Dec 17, 2021
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
*/

!/deploy/
!/deploy/**/*
!/docker/
!/docker/branding
!/docs/
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ RUN curl -sO http://nginx.org/keys/nginx_signing.key && \
# - modify perms for non-root runtime
RUN ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.log && \
sed -i 's/\/var\/run\/nginx.pid/\/var\/cache\/nginx\/nginx.pid/g' /etc/nginx/nginx.conf && \
sed -i 's|/var/run/nginx.pid|/var/cache/nginx/nginx.pid|g' /etc/nginx/nginx.conf && \
sed -i -e '/user/!b' -e '/nginx/!b' -e '/nginx/d' /etc/nginx/nginx.conf && \
echo -e "load_module modules/ngx_http_js_module.so;\n$(cat /etc/nginx/nginx.conf)" > /etc/nginx/nginx.conf && \
# Uncomment this line to output info log for nginx.js
#sed -i 's|/var/log/nginx/error.log warn|/var/log/nginx/error.log info|g' /etc/nginx/nginx.conf && \
rm -f /etc/nginx/conf.d/default.conf && \
chown -R 998 /var/cache/nginx /etc/nginx && \
chmod -R g=u /var/cache/nginx /etc/nginx
Expand All @@ -67,7 +69,7 @@ RUN touch config.js && \
mkdir -p /usr/share/nginx/html/integration/osconsole && \
ln -sf /config.js /usr/share/nginx/html/integration/osconsole/config.js

COPY docker/nginx.js docker/rbac.js docker/js-yaml.js /etc/nginx/conf.d/
COPY docker/nginx.js docker/rbac.js docker/js-yaml.js docker/jwt-decode.js /etc/nginx/conf.d/
COPY docker/nginx.conf docker/nginx-gateway.conf.template docker/osconsole/config.sh docker/nginx.sh docker/ACL.yaml /

COPY --from=builder /hawtio-online/docker/site /usr/share/nginx/html/
Expand Down
19 changes: 19 additions & 0 deletions deploy/bases/configmap-hawtio-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: hawtio-integration
data:
hawtconfig.json: |
{
"about": {
"title": "Hawtio Integration Console",
"productInfo": [],
"additionalInfo": "The Hawtio Integration Console enables introspecting Java applications.",
"copyright": ""
},
"branding": {
"appName": "Hawtio Integration Console",
"appLogoUrl": "img/hawtio-logo.svg"
},
"disabledRoutes": []
}
19 changes: 19 additions & 0 deletions deploy/bases/configmap-hawtio-online.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: hawtio-online
data:
hawtconfig.json: |
{
"about": {
"title": "Hawtio OpenShift Console",
tadayosi marked this conversation as resolved.
Show resolved Hide resolved
"productInfo": [],
"additionalInfo": "The Hawtio OpenShift Console eases the discovery and management of 'hawtio-enabled' applications deployed on OpenShift.",
"copyright": ""
},
"branding": {
"appName": "Hawtio OpenShift Console",
"appLogoUrl": "img/hawtio-logo.svg"
},
"disabledRoutes": []
}
Loading