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

Jump to bottom

Launch - add service annotations, remove ingress v1beta1 #147

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Launch - add service annotations, remove ingress v1beta1 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Update from Tricentis-qTest/qtest-chart
  • Loading branch information
@byangtri
byangtri committed Oct 10, 2023
commit a8791cccf30c701fc682cea04abd3129ad563acf
2 changes: 1 addition & 1 deletion Charts/qtest-launch/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kubeVersion: ">=1.18.0-0"
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 1.0.8
version: 1.0.9
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
4 changes: 0 additions & 4 deletions Charts/qtest-launch/templates/ingress-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{{- if .Values.ingressClass.enabled }}
{{- if semverCompare ">=1.18" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: networking.k8s.io/v1beta1
{{- end}}
kind: IngressClass
metadata:
name: "{{ include "qtest-launch.fullname" . }}-ingressclass"
Expand Down
4 changes: 0 additions & 4 deletions Charts/qtest-launch/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $paths := .Values.ingress.paths -}}
{{- $extraPaths := .Values.ingress.extraPaths -}}
{{- if semverCompare ">=1.18" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: networking.k8s.io/v1beta1
{{- end}}
kind: Ingress
metadata:
name: {{ .Values.ingress.name }}
Expand Down
8 changes: 8 additions & 0 deletions Charts/qtest-launch/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ kind: Service
metadata:
name: {{ .Values.service.serviceName }}
namespace: {{ .Values.namespace.name }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
app: qtest-launch
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
Expand Down Expand Up @@ -31,6 +35,10 @@ kind: Service
metadata:
name: {{ .Values.service.serviceName }}-canary
namespace: {{ .Values.namespace.name }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
app: qtest-launch
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
Expand Down
1 change: 1 addition & 0 deletions Charts/qtest-launch/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ rollouts:
- pause: {duration: 10s}
service:
type: LoadBalancer
annotations: {}
port: 3080
targetPort: 3080
targetHttpsPort: 3443
Expand Down
Loading