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.

Sign up for GitHub

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

SS 693 ingress does not care if app is public or private #101

Merged
merged 8 commits into from
Nov 16, 2023
Merged

SS 693 ingress does not care if app is public or private #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c55ebe
Update must be able to change the app parameters -> adding action upd…
sandstromviktor Nov 15, 2023
446147d
Fixed ingress condition to custom app -> public settings removes auth…
sandstromviktor Nov 15, 2023
7f8b062
Fixed ingress condition to dash app -> public settings removes auth-url
sandstromviktor Nov 15, 2023
7597831
Fixed ingress condition to shiny+shinyproxy app -> public settings re…
sandstromviktor Nov 15, 2023
a10ae7a
Fixed ingress condition to pytorch+tensorflow serving apps -> public …
sandstromviktor Nov 15, 2023
9afc8e7
Merge branch 'develop' into SS-693-ingress-does-not-care-if-app-is-pu…
sandstromviktor Nov 16, 2023
285b824
Merge branch 'develop' into SS-693-ingress-does-not-care-if-app-is-pu…
sandstromviktor Nov 16, 2023
043c3ab
Merge branch 'develop' into SS-693-ingress-does-not-care-if-app-is-pu…
sandstromviktor Nov 16, 2023
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
7 changes: 1 addition & 6 deletions apps/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,14 @@ def deploy_resource(instance_pk, action="create"):
app_instance = AppInstance.objects.select_for_update().get(pk=instance_pk)
status = AppStatus(appinstance=app_instance)

if action == "create":
if (action == "create") or (action == "update"):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding update action that actually updates the app parameters. This was not done before some some odd reason.

parameters = app_instance.parameters
status.status_type = "Created"
status.info = parameters["release"]

# For backwards-compatibility with old ingress spec:
if "ingress" not in parameters:
parameters["ingress"] = dict()
try:
print("Ingress v1beta1: {}".format(settings.INGRESS_V1BETA1))
parameters["ingress"]["v1beta1"] = settings.INGRESS_V1BETA1
except: # noqa E722 TODO: Add exception
pass
Comment on lines -214 to -218
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fails always, so i've removed it.


app_instance.parameters = parameters
print("App Instance paramenters: {}".format(app_instance))
Expand Down
32 changes: 3 additions & 29 deletions charts/apps/custom-app/chart/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
{{ if .Values.ingress.v1beta1 }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ .Release.Name }}-ingress
namespace: {{ .Values.namespace }}
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
http:
paths:
- path: /
backend:
serviceName: {{ .Values.service.name }}
servicePort: {{ .Values.service.port }}
tls:
- secretName: {{ .Values.ingress.secretName }}
hosts:
- {{ .Values.global.domain }}
{{ else }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -32,9 +6,10 @@ metadata:
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
{{ if ne .Values.permission "public" }}
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
{{- end }}
Comment on lines +9 to +12
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is added to ingress files for dash, shiny, custom app etc.

spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
Expand All @@ -50,5 +25,4 @@ spec:
tls:
- secretName: {{ .Values.ingress.secretName }}
hosts:
- {{ .Values.global.domain }}
{{- end }}
- {{ .Values.global.domain }}
1 change: 0 additions & 1 deletion charts/apps/custom-app/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ imagePullSecrets:
- name: regcred

ingress:
v1beta1: false
secretName: prod-ingress

podSecurityContext:
Expand Down
30 changes: 2 additions & 28 deletions charts/apps/dash/chart/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
{{ if .Values.ingress.v1beta1 }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ .Release.Name }}-ingress
namespace: {{ .Values.namespace }}
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
http:
paths:
- path: /
backend:
serviceName: {{ .Values.service.name }}
servicePort: {{ .Values.service.port }}
tls:
- secretName: {{ .Values.ingress.secretName }}
hosts:
- {{ .Values.global.domain }}
{{ else }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -32,9 +6,10 @@ metadata:
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
{{ if ne .Values.permission "public" }}
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
{{- end }}
spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
Expand All @@ -51,4 +26,3 @@ spec:
- secretName: {{ .Values.ingress.secretName }}
hosts:
- {{ .Values.global.domain }}
{{- end }}
1 change: 0 additions & 1 deletion charts/apps/dash/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ imagePullSecrets:
- name: regcred

ingress:
v1beta1: false
secretName: prod-ingress

podSecurityContext:
Expand Down
2 changes: 2 additions & 0 deletions charts/apps/pytorch-serve/chart/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ metadata:
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
nginx.ingress.kubernetes.io/proxy-body-size: "500m"
{{ if ne .Values.permission "public" }}
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
{{- end }}
name: {{ .Release.Name }}-ingress
namespace: {{ .Values.namespace }}
spec:
Expand Down
1 change: 0 additions & 1 deletion charts/apps/pytorch-serve/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ imagePullSecrets:
- name: regcred

ingress:
v1beta1: false

podSecurityContext:
seccompProfile:
Expand Down
32 changes: 3 additions & 29 deletions charts/apps/shiny/chart/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
{{ if .Values.ingress.v1beta1 }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ .Release.Name }}-ingress
namespace: {{ .Values.namespace }}
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
http:
paths:
- path: /
backend:
serviceName: {{ .Values.service.name }}
servicePort: {{ .Values.service.port }}
tls:
- secretName: {{ .Values.ingress.secretName }}
hosts:
- {{ .Values.global.domain }}
{{ else }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -32,9 +6,10 @@ metadata:
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
{{ if ne .Values.permission "public" }}
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
{{- end }}
spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
Expand All @@ -50,5 +25,4 @@ spec:
tls:
- secretName: {{ .Values.ingress.secretName }}
hosts:
- {{ .Values.global.domain }}
{{- end }}
- {{ .Values.global.domain }}
1 change: 0 additions & 1 deletion charts/apps/shiny/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ imagePullSecrets:
- name: regcred

ingress:
v1beta1: false
secretName: prod-ingress

podSecurityContext:
Expand Down
31 changes: 3 additions & 28 deletions charts/apps/shinyproxy/chart/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
{{ if .Values.ingress.v1beta1 }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ .Release.Name }}-ingress
namespace: {{ .Values.namespace }}
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
http:
paths:
- path: /
backend:
serviceName: {{ .Values.service.name }}
servicePort: 80
tls:
- secretName: prod-ingress
hosts:
- {{ .Values.global.domain }}
{{ else }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -32,8 +6,10 @@ metadata:
labels:
io.kompose.service: {{ .Release.Name }}-ingress
annotations:
{{ if ne .Values.permission "public" }}
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
{{- end }}
#nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
spec:
rules:
Expand All @@ -50,5 +26,4 @@ spec:
tls:
- secretName: prod-ingress
hosts:
- {{ .Values.global.domain }}
{{- end }}
- {{ .Values.global.domain }}
1 change: 0 additions & 1 deletion charts/apps/shinyproxy/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ service:
name: shinyproxy-svc

ingress:
v1beta1: false
secretName: prod-ingress

s3sync:
Expand Down
36 changes: 3 additions & 33 deletions charts/apps/tensorflow-serve/chart/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,3 @@
{{ if .Values.ingress.v1beta1 }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
labels:
app: tensorflow-serving
host: {{ .Release.Name }}.{{ .Values.global.domain }}
annotations:
nginx.ingress.kubernetes.io/proxy-connect-timeout: "600"
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
nginx.ingress.kubernetes.io/proxy-body-size: "500m"
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
name: {{ .Release.Name }}-ingress
namespace: {{ .Values.namespace }}
spec:
rules:
- host: {{ .Release.Name }}.{{ .Values.global.domain }}
http:
paths:
- path: /
backend:
serviceName: {{ $.Release.Name }}-tf-svc
servicePort: 80
tls:
- secretName: prod-ingress
hosts:
- {{ .Release.Name }}.{{ .Values.global.domain }}
{{ else }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -39,8 +9,10 @@ metadata:
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
nginx.ingress.kubernetes.io/proxy-body-size: "500m"
{{ if ne .Values.permission "public" }}
nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
{{- end }}
name: {{ .Release.Name }}-ingress
namespace: {{ .Values.namespace }}
spec:
Expand All @@ -58,6 +30,4 @@ spec:
tls:
- secretName: prod-ingress
hosts:
- {{ .Release.Name }}.{{ .Values.global.domain }}

{{- end }}
- {{ .Release.Name }}.{{ .Values.global.domain }}
1 change: 0 additions & 1 deletion charts/apps/tensorflow-serve/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ imagePullSecrets:
- name: regcred

ingress:
v1beta1: false

podSecurityContext:
seccompProfile:
Expand Down