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

Improve the route/ingress selection. Adds icon #112

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions deployment/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: trs-filer
description: A Helm chart for Kubernetes

icon: https://avatars.githubusercontent.com/u/60704687?s=48&v=4
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
Expand All @@ -14,7 +14,7 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.0
version: 0.1.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
Expand Down
6 changes: 3 additions & 3 deletions deployment/templates/trs-filer-route.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if eq .Values.clusterType "openshift" }}
{{ if .Capabilities.APIVersions.Has "route.openshift.io/v1" }}
apiVersion: route.openshift.io/v1
kind: Route
metadata:
Expand All @@ -17,7 +17,7 @@ spec:
wildcardPolicy: None
status:
ingress: []
{{ else if eq .Values.clusterType "kubernetes" }}
{{ else if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
{{ if .Values.kubernetes.ingress.enabled }}
lvarin marked this conversation as resolved.
Show resolved Hide resolved
apiVersion: networking.k8s.io/v1
kind: Ingress
Expand Down Expand Up @@ -48,4 +48,4 @@ spec:
secretName: {{ .Values.trs_filer.appName }}-ingress-secret
{{ end }}
{{ end }}
{{ end }}
{{ end }}
6 changes: 2 additions & 4 deletions deployment/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

clusterType: openshift

host_name: trs-filer-test.c03.k8s-popup.csc.fi
host_name: trs-filer-test.2.rahtiapp.fi
lvarin marked this conversation as resolved.
Show resolved Hide resolved

trs_filer:
image: lvarin/trs-filer:0.1.0
image: elixircloud/trs-filer:0.1.0
appName: trs-filer

apiServer: kubernetes.default.svc:443 # address of k8s API server
Expand Down
Loading