Skip to content

Commit

Permalink
adding *.yaml and *.sh with eol=lf to .gitattributes for easier WSL d…
Browse files Browse the repository at this point in the history
…evelopment with autocrlf
  • Loading branch information
luthermonson committed Jun 24, 2022
1 parent ee51392 commit 8838a7c
Show file tree
Hide file tree
Showing 12 changed files with 443 additions and 440 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Specify generated cluster templates as generated files
**/cluster-template-*.yaml linguist-generated

*.sh text eol=lf
*.yaml text eol=lf
84 changes: 42 additions & 42 deletions hack/observability/jaeger/chart/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
{{- if .Values.enabled }}
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "jaeger-all-in-one.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.enabled }}
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "jaeger-all-in-one.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
32 changes: 16 additions & 16 deletions hack/observability/jaeger/chart/templates/jaeger-volume.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{{- if .Values.enabled }}
{{- if .Values.volume.enabled -}}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ include "jaeger-all-in-one.fullname" . }}
spec:
{{- if .Values.volume.className }}
storageClassName: {{ .Values.volume.className }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.volume.size }}
{{- end }}
{{- if .Values.enabled }}
{{- if .Values.volume.enabled -}}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ include "jaeger-all-in-one.fullname" . }}
spec:
{{- if .Values.volume.className }}
storageClassName: {{ .Values.volume.className }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.volume.size }}
{{- end }}
{{- end }}
108 changes: 54 additions & 54 deletions hack/observability/jaeger/chart/templates/service-headless.yaml
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
{{- if .Values.enabled }}
apiVersion: v1
kind: Service
metadata:
name: {{ include "jaeger-all-in-one.fullname" . }}-headless
labels:
{{- include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- with .Values.service.headless.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
clusterIP: None
ports:
- port: 6831
targetPort: udp-com-thr
protocol: UDP
name: udp-com-thr
- port: 6832
targetPort: udp-bin-thr
protocol: UDP
name: udp-bin-thr
- port: 5775
targetPort: udp-bin-thr-o
protocol: UDP
name: udp-bin-thr-o
- port: 5778
targetPort: http-configs
protocol: TCP
name: http-configs
- port: {{ .Values.service.port }}
targetPort: http-ui
protocol: TCP
name: http-ui
- port: 14250
targetPort: grpc-proto
protocol: TCP
name: grpc-proto
- port: 14268
targetPort: http-bin-thr
protocol: TCP
name: http-bin-thr
- port: 14269
targetPort: http-admin
protocol: TCP
name: http-admin
{{- if .Values.enableHttpZipkinCollector }}
- port: 9411
targetPort: http-zipkin
protocol: TCP
name: http-zipkin
{{- end }}
selector:
{{- include "jaeger-all-in-one.selectorLabels" . | nindent 4 }}
{{- if .Values.enabled }}
apiVersion: v1
kind: Service
metadata:
name: {{ include "jaeger-all-in-one.fullname" . }}-headless
labels:
{{- include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- with .Values.service.headless.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
clusterIP: None
ports:
- port: 6831
targetPort: udp-com-thr
protocol: UDP
name: udp-com-thr
- port: 6832
targetPort: udp-bin-thr
protocol: UDP
name: udp-bin-thr
- port: 5775
targetPort: udp-bin-thr-o
protocol: UDP
name: udp-bin-thr-o
- port: 5778
targetPort: http-configs
protocol: TCP
name: http-configs
- port: {{ .Values.service.port }}
targetPort: http-ui
protocol: TCP
name: http-ui
- port: 14250
targetPort: grpc-proto
protocol: TCP
name: grpc-proto
- port: 14268
targetPort: http-bin-thr
protocol: TCP
name: http-bin-thr
- port: 14269
targetPort: http-admin
protocol: TCP
name: http-admin
{{- if .Values.enableHttpZipkinCollector }}
- port: 9411
targetPort: http-zipkin
protocol: TCP
name: http-zipkin
{{- end }}
selector:
{{- include "jaeger-all-in-one.selectorLabels" . | nindent 4 }}
{{- end }}
108 changes: 54 additions & 54 deletions hack/observability/jaeger/chart/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
{{- if .Values.enabled }}
apiVersion: v1
kind: Service
metadata:
name: {{ include "jaeger-all-in-one.fullname" . }}
labels:
{{- include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.service.type }}
ports:
- port: 6831
targetPort: udp-com-thr
protocol: UDP
name: udp-com-thr
- port: 6832
targetPort: udp-bin-thr
protocol: UDP
name: udp-bin-thr
- port: 5775
targetPort: udp-bin-thr-o
protocol: UDP
name: udp-bin-thr-o
- port: 5778
targetPort: http-configs
protocol: TCP
name: http-configs
- port: {{ .Values.service.port }}
targetPort: http-ui
protocol: TCP
name: http-ui
- port: 14250
targetPort: grpc-proto
protocol: TCP
name: grpc-proto
- port: 14268
targetPort: http-bin-thr
protocol: TCP
name: http-bin-thr
- port: 14269
targetPort: http-admin
protocol: TCP
name: http-admin
{{- if .Values.enableHttpZipkinCollector }}
- port: 9411
targetPort: http-zipkin
protocol: TCP
name: http-zipkin
{{- end }}
selector:
{{- include "jaeger-all-in-one.selectorLabels" . | nindent 4 }}
{{- if .Values.enabled }}
apiVersion: v1
kind: Service
metadata:
name: {{ include "jaeger-all-in-one.fullname" . }}
labels:
{{- include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.service.type }}
ports:
- port: 6831
targetPort: udp-com-thr
protocol: UDP
name: udp-com-thr
- port: 6832
targetPort: udp-bin-thr
protocol: UDP
name: udp-bin-thr
- port: 5775
targetPort: udp-bin-thr-o
protocol: UDP
name: udp-bin-thr-o
- port: 5778
targetPort: http-configs
protocol: TCP
name: http-configs
- port: {{ .Values.service.port }}
targetPort: http-ui
protocol: TCP
name: http-ui
- port: 14250
targetPort: grpc-proto
protocol: TCP
name: grpc-proto
- port: 14268
targetPort: http-bin-thr
protocol: TCP
name: http-bin-thr
- port: 14269
targetPort: http-admin
protocol: TCP
name: http-admin
{{- if .Values.enableHttpZipkinCollector }}
- port: 9411
targetPort: http-zipkin
protocol: TCP
name: http-zipkin
{{- end }}
selector:
{{- include "jaeger-all-in-one.selectorLabels" . | nindent 4 }}
{{- end }}
18 changes: 9 additions & 9 deletions hack/observability/jaeger/chart/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{{- if .Values.enabled }}
{{- if .Values.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "jaeger-all-in-one.serviceAccountName" . }}
labels:
{{ include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- end -}}
{{- if .Values.enabled }}
{{- if .Values.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "jaeger-all-in-one.serviceAccountName" . }}
labels:
{{ include "jaeger-all-in-one.labels" . | nindent 4 }}
{{- end -}}
{{- end }}
Loading

0 comments on commit 8838a7c

Please sign in to comment.