diff --git a/Containerfile b/Containerfile index 7b9c057..8c2c2b9 100644 --- a/Containerfile +++ b/Containerfile @@ -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 USER root -RUN yum install --assumeyes \ - python-flask \ - python-flask-wtf \ - && yum clean all +RUN dnf install --assumeyes \ + python3-flask \ + python3-flask-wtf \ + && dnf clean all USER 1000 diff --git a/app/qrwebform.py b/app/qrwebform.py index 964a678..fbc2361 100755 --- a/app/qrwebform.py +++ b/app/qrwebform.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 from flask import Flask, render_template, flash, request from wtforms import Form, TextField @@ -17,9 +17,9 @@ class ReusableForm(Form): if request.method == "POST": target_url = request.form["url"] 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__": app.run(host='::') diff --git a/qrgen.yaml b/qrgen.yaml index 9b765ad..ba1dbe2 100644 --- a/qrgen.yaml +++ b/qrgen.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: qrfrontend - image: docker-registry.default.svc:5000/devops-team/qrfrontend:002 + image: pipebreaker.pl:5000/qrgen:002 ports: - containerPort: 5000 resources: @@ -29,7 +29,8 @@ spec: cpu: 500m memory: 256Mi - 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: - containerPort: 8080 resources: @@ -60,52 +61,26 @@ spec: protocol: TCP --- -kind: Route -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 +kind: Ingress apiVersion: networking.k8s.io/v1 metadata: - name: allowall-qrgen + name: "qrgen" spec: - podSelector: - matchLabels: - name: qrgen - ingress: - - ports: - - port: 5000 - - port: 8080 - from: [] - + rules: + - host: qrgen.tau.pipebreaker.pl + http: + paths: + - path: /render + pathType: Prefix + backend: + service: + name: qrgen + port: + name: backend + - path: / + pathType: Prefix + backend: + service: + name: qrgen + port: + name: frontend