qrgen: rebuild image with fedora, customize to home cluster
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
FROM artifactory.hcp.preprod.oneadr.net/docker-nordea-images-local/nordea-python-36-rhel7:1
|
FROM fedora:latest
|
||||||
|
|
||||||
# workaround for running yum in container
|
# workaround for running yum in container
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
RUN yum install --assumeyes \
|
RUN dnf install --assumeyes \
|
||||||
python-flask \
|
python3-flask \
|
||||||
python-flask-wtf \
|
python3-flask-wtf \
|
||||||
&& yum clean all
|
&& dnf clean all
|
||||||
|
|
||||||
USER 1000
|
USER 1000
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python3
|
||||||
|
|
||||||
from flask import Flask, render_template, flash, request
|
from flask import Flask, render_template, flash, request
|
||||||
from wtforms import Form, TextField
|
from wtforms import Form, TextField
|
||||||
@@ -17,9 +17,9 @@ class ReusableForm(Form):
|
|||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
target_url = request.form["url"]
|
target_url = request.form["url"]
|
||||||
else:
|
else:
|
||||||
target_url = "https://qrgen.ap-opiate-app.test01.qaoneadr.local/"
|
target_url = "http://qrgen.tau.pipebreaker.pl/"
|
||||||
|
|
||||||
return render_template("main.html", form=form, target_url=target_url, genurl="https://qrgen.ap-opiate-app.test01.qaoneadr.local/render/")
|
return render_template("main.html", form=form, target_url=target_url, genurl="http://qrgen.tau.pipebreaker.pl/render/")
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
app.run(host='::')
|
app.run(host='::')
|
||||||
|
|||||||
71
qrgen.yaml
71
qrgen.yaml
@@ -18,7 +18,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: qrfrontend
|
- name: qrfrontend
|
||||||
image: docker-registry.default.svc:5000/devops-team/qrfrontend:002
|
image: pipebreaker.pl:5000/qrgen:002
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 5000
|
- containerPort: 5000
|
||||||
resources:
|
resources:
|
||||||
@@ -29,7 +29,8 @@ spec:
|
|||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
- name: qrbackend
|
- name: qrbackend
|
||||||
image: docker-registry.default.svc:5000/devops-team/samwierema-go-qr-generator
|
#image: pipebreaker.pl:5000/samwierema-go-qr-generator
|
||||||
|
image: docker.io/samwierema/go-qr-generator
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 8080
|
||||||
resources:
|
resources:
|
||||||
@@ -60,52 +61,26 @@ spec:
|
|||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: Route
|
kind: Ingress
|
||||||
apiVersion: v1
|
|
||||||
metadata:
|
|
||||||
name: qrfrontend
|
|
||||||
spec:
|
|
||||||
host: qrgen.ap-opiate-app.test01.qaoneadr.local
|
|
||||||
path: "/"
|
|
||||||
to:
|
|
||||||
kind: Service
|
|
||||||
name: qrgen
|
|
||||||
port:
|
|
||||||
targetPort: frontend
|
|
||||||
tls:
|
|
||||||
termination: edge
|
|
||||||
insecureEdgeTerminationPolicy: Redirect
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: Route
|
|
||||||
apiVersion: v1
|
|
||||||
metadata:
|
|
||||||
name: qrbackend
|
|
||||||
spec:
|
|
||||||
host: qrgen.ap-opiate-app.test01.qaoneadr.local
|
|
||||||
path: "/render"
|
|
||||||
to:
|
|
||||||
kind: Service
|
|
||||||
name: qrgen
|
|
||||||
port:
|
|
||||||
targetPort: backend
|
|
||||||
tls:
|
|
||||||
termination: edge
|
|
||||||
insecureEdgeTerminationPolicy: Redirect
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: NetworkPolicy
|
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: allowall-qrgen
|
name: "qrgen"
|
||||||
spec:
|
spec:
|
||||||
podSelector:
|
rules:
|
||||||
matchLabels:
|
- host: qrgen.tau.pipebreaker.pl
|
||||||
name: qrgen
|
http:
|
||||||
ingress:
|
paths:
|
||||||
- ports:
|
- path: /render
|
||||||
- port: 5000
|
pathType: Prefix
|
||||||
- port: 8080
|
backend:
|
||||||
from: []
|
service:
|
||||||
|
name: qrgen
|
||||||
|
port:
|
||||||
|
name: backend
|
||||||
|
- path: /
|
||||||
|
pathType: Prefix
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: qrgen
|
||||||
|
port:
|
||||||
|
name: frontend
|
||||||
|
|||||||
Reference in New Issue
Block a user