Add flower ingress and port
This commit is contained in:
		
							parent
							
								
									0e92508ac3
								
							
						
					
					
						commit
						bad619b441
					
				
					 2 changed files with 70 additions and 1 deletions
				
			
		| 
						 | 
					@ -37,7 +37,10 @@ spec:
 | 
				
			||||||
            {{- toYaml .Values.securityContext | nindent 12 }}
 | 
					            {{- toYaml .Values.securityContext | nindent 12 }}
 | 
				
			||||||
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
 | 
					          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
 | 
				
			||||||
          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
					          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
				
			||||||
          containerPort: 5555
 | 
					          ports:
 | 
				
			||||||
 | 
					          - containerPort: 5555
 | 
				
			||||||
 | 
					            name: http
 | 
				
			||||||
 | 
					            protocol: TCP
 | 
				
			||||||
          resources:
 | 
					          resources:
 | 
				
			||||||
            {{- toYaml .Values.flower.resources | nindent 12 }}
 | 
					            {{- toYaml .Values.flower.resources | nindent 12 }}
 | 
				
			||||||
          env:
 | 
					          env:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										66
									
								
								templates/flower/ingress.yaml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								templates/flower/ingress.yaml
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,66 @@
 | 
				
			||||||
 | 
					{{- if .Values.flower.ingress.enabled -}}
 | 
				
			||||||
 | 
					{{- $fullName := include "django.fullname" . -}}
 | 
				
			||||||
 | 
					{{- $svcPort := .Values.flower.service.port -}}
 | 
				
			||||||
 | 
					{{- if and .Values.flower.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
 | 
				
			||||||
 | 
					  {{- if not (hasKey .Values.flower.ingress.annotations "kubernetes.io/ingress.class") }}
 | 
				
			||||||
 | 
					  {{- $_ := set .Values.flower.ingress.annotations "kubernetes.io/ingress.class" .Values.flower.ingress.className}}
 | 
				
			||||||
 | 
					  {{- end }}
 | 
				
			||||||
 | 
					{{- end }}
 | 
				
			||||||
 | 
					{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 | 
				
			||||||
 | 
					apiVersion: networking.k8s.io/v1
 | 
				
			||||||
 | 
					{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 | 
				
			||||||
 | 
					apiVersion: networking.k8s.io/v1beta1
 | 
				
			||||||
 | 
					{{- else -}}
 | 
				
			||||||
 | 
					apiVersion: extensions/v1beta1
 | 
				
			||||||
 | 
					{{- end }}
 | 
				
			||||||
 | 
					kind: Ingress
 | 
				
			||||||
 | 
					metadata:
 | 
				
			||||||
 | 
					  name: {{ $fullName }}-flower
 | 
				
			||||||
 | 
					  labels:
 | 
				
			||||||
 | 
					    {{- include "django.labels" . | nindent 4 }}
 | 
				
			||||||
 | 
					  {{- with .Values.flower.ingress.annotations }}
 | 
				
			||||||
 | 
					  annotations:
 | 
				
			||||||
 | 
					    {{- toYaml . | nindent 4 }}
 | 
				
			||||||
 | 
					  {{- end }}
 | 
				
			||||||
 | 
					spec:
 | 
				
			||||||
 | 
					  {{- if and .Values.flower.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
 | 
				
			||||||
 | 
					  ingressClassName: {{ .Values.flower.ingress.className }}
 | 
				
			||||||
 | 
					  {{- end }}
 | 
				
			||||||
 | 
					  {{- if .Values.flower.ingress.tls }}
 | 
				
			||||||
 | 
					  tls:
 | 
				
			||||||
 | 
					    {{- range .Values.flower.ingress.tls }}
 | 
				
			||||||
 | 
					    - hosts:
 | 
				
			||||||
 | 
					        {{- range .hosts }}
 | 
				
			||||||
 | 
					        - {{ . | quote }}
 | 
				
			||||||
 | 
					        {{- end }}
 | 
				
			||||||
 | 
					      secretName: {{ .secretName }}
 | 
				
			||||||
 | 
					    {{- end }}
 | 
				
			||||||
 | 
					  {{- end }}
 | 
				
			||||||
 | 
					  rules:
 | 
				
			||||||
 | 
					    {{- range .Values.flower.ingress.hosts }}
 | 
				
			||||||
 | 
					    - host: {{ .host | quote }}
 | 
				
			||||||
 | 
					      http:
 | 
				
			||||||
 | 
					        paths:
 | 
				
			||||||
 | 
					          {{- range .paths }}
 | 
				
			||||||
 | 
					          - path: {{ .path }}
 | 
				
			||||||
 | 
					            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
 | 
				
			||||||
 | 
					            pathType: {{ .pathType }}
 | 
				
			||||||
 | 
					            {{- end }}
 | 
				
			||||||
 | 
					            {{- if .backend }}
 | 
				
			||||||
 | 
					            backend:
 | 
				
			||||||
 | 
					              {{- toYaml .backend | nindent 14 }}
 | 
				
			||||||
 | 
					            {{- else }}
 | 
				
			||||||
 | 
					            backend:
 | 
				
			||||||
 | 
					              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
 | 
				
			||||||
 | 
					              service:
 | 
				
			||||||
 | 
					                name: {{ $fullName }}-flower
 | 
				
			||||||
 | 
					                port:
 | 
				
			||||||
 | 
					                  number: {{ $svcPort }}
 | 
				
			||||||
 | 
					              {{- else }}
 | 
				
			||||||
 | 
					              serviceName: {{ $fullName }}
 | 
				
			||||||
 | 
					              servicePort: {{ $svcPort }}
 | 
				
			||||||
 | 
					              {{- end }}
 | 
				
			||||||
 | 
					            {{- end }}
 | 
				
			||||||
 | 
					          {{- end }}
 | 
				
			||||||
 | 
					    {{- end }}
 | 
				
			||||||
 | 
					{{- end }}
 | 
				
			||||||
		Reference in a new issue