chore: remove fullname because it is not needed
This commit is contained in:
@@ -30,7 +30,7 @@ ingress:
|
|||||||
```yaml
|
```yaml
|
||||||
gateway:
|
gateway:
|
||||||
enabled: true
|
enabled: true
|
||||||
gatewayClassName: "cloudflare" # or your gateway class
|
gatewayClassName: 'cloudflare' # or your gateway class
|
||||||
|
|
||||||
httpRoute:
|
httpRoute:
|
||||||
enabled: true
|
enabled: true
|
||||||
@@ -74,7 +74,7 @@ httpRoute:
|
|||||||
```yaml
|
```yaml
|
||||||
env:
|
env:
|
||||||
- name: DISABLE_IPV6
|
- name: DISABLE_IPV6
|
||||||
value: "true"
|
value: 'true'
|
||||||
```
|
```
|
||||||
|
|
||||||
## Publish this chart to GHCR (OCI) for testing/deploying
|
## Publish this chart to GHCR (OCI) for testing/deploying
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
{{- if .Values.httpRoute.enabled }}
|
{{- if .Values.httpRoute.enabled }}
|
||||||
{{- $defaultGatewayName := .Values.gateway.name -}}
|
{{- $defaultGatewayName := .Values.gateway.name -}}
|
||||||
{{- if not $defaultGatewayName -}}
|
{{- if not $defaultGatewayName -}}
|
||||||
{{- $defaultGatewayName = printf "%s-gateway" (include "bentopdf.fullname" .) -}}
|
{{- $defaultGatewayName = printf "%s-gateway" (include "bentopdf.name" .) -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- $defaultGatewayNs := .Release.Namespace -}}
|
{{- $defaultGatewayNs := .Release.Namespace -}}
|
||||||
{{- if .Values.gateway.enabled -}}
|
{{- if .Values.gateway.enabled -}}
|
||||||
@@ -31,13 +31,13 @@
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- else if contains "NodePort" .Values.service.type }}
|
{{- else if contains "NodePort" .Values.service.type }}
|
||||||
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "bentopdf.fullname" . }})
|
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "bentopdf.name" . }})
|
||||||
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
|
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
|
||||||
echo http://$NODE_IP:$NODE_PORT
|
echo http://$NODE_IP:$NODE_PORT
|
||||||
{{- else if contains "LoadBalancer" .Values.service.type }}
|
{{- else if contains "LoadBalancer" .Values.service.type }}
|
||||||
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
|
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
|
||||||
You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "bentopdf.fullname" . }}'
|
You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "bentopdf.name" . }}'
|
||||||
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "bentopdf.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
|
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "bentopdf.name" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
|
||||||
echo http://$SERVICE_IP:{{ .Values.service.port }}
|
echo http://$SERVICE_IP:{{ .Values.service.port }}
|
||||||
{{- else if contains "ClusterIP" .Values.service.type }}
|
{{- else if contains "ClusterIP" .Values.service.type }}
|
||||||
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "bentopdf.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
|
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "bentopdf.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
|
||||||
|
|||||||
@@ -5,24 +5,6 @@ Expand the name of the bentopdf
|
|||||||
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{/*
|
|
||||||
Create a default fully qualified app name.
|
|
||||||
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
|
||||||
If release name contains chart name it will be used as a full name.
|
|
||||||
*/}}
|
|
||||||
{{- define "bentopdf.fullname" -}}
|
|
||||||
{{- if .Values.fullnameOverride }}
|
|
||||||
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
|
|
||||||
{{- else }}
|
|
||||||
{{- $name := default .Chart.Name .Values.nameOverride }}
|
|
||||||
{{- if contains $name .Release.Name }}
|
|
||||||
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
|
|
||||||
{{- else }}
|
|
||||||
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Create chart name and version as used by the chart label.
|
Create chart name and version as used by the chart label.
|
||||||
*/}}
|
*/}}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "bentopdf.fullname" . }}
|
name: {{ include "bentopdf.name" . }}
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "bentopdf.labels" . | nindent 4 }}
|
{{- include "bentopdf.labels" . | nindent 4 }}
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{{- if .Values.gateway.enabled -}}
|
{{- if .Values.gateway.enabled -}}
|
||||||
{{- $gatewayName := .Values.gateway.name -}}
|
{{- $gatewayName := .Values.gateway.name -}}
|
||||||
{{- if not $gatewayName -}}
|
{{- if not $gatewayName -}}
|
||||||
{{- $gatewayName = printf "%s-gateway" (include "bentopdf.fullname" .) -}}
|
{{- $gatewayName = printf "%s-gateway" (include "bentopdf.name" .) -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- $gatewayNs := default .Release.Namespace .Values.gateway.namespace -}}
|
{{- $gatewayNs := default .Release.Namespace .Values.gateway.namespace -}}
|
||||||
apiVersion: gateway.networking.k8s.io/v1
|
apiVersion: gateway.networking.k8s.io/v1
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
apiVersion: gateway.networking.k8s.io/v1
|
apiVersion: gateway.networking.k8s.io/v1
|
||||||
kind: HTTPRoute
|
kind: HTTPRoute
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "bentopdf.fullname" . }}
|
name: {{ include "bentopdf.name" . }}
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "bentopdf.labels" . | nindent 4 }}
|
{{- include "bentopdf.labels" . | nindent 4 }}
|
||||||
{{- with .Values.httpRoute.annotations }}
|
{{- with .Values.httpRoute.annotations }}
|
||||||
@@ -14,7 +15,7 @@ spec:
|
|||||||
{{- if .Values.httpRoute.parentRefs }}
|
{{- if .Values.httpRoute.parentRefs }}
|
||||||
{{- range $ref := .Values.httpRoute.parentRefs }}
|
{{- range $ref := .Values.httpRoute.parentRefs }}
|
||||||
- name: {{ $.Values.gateway.name | default $ref.name | quote }}
|
- name: {{ $.Values.gateway.name | default $ref.name | quote }}
|
||||||
namespace: {{ $ref.namespace | default (default .Release.Namespace .Values.gateway.namespace) | quote }}
|
namespace: {{ $ref.namespace | default (default $.Release.Namespace $.Values.gateway.namespace) | quote }}
|
||||||
sectionName: {{ $ref.sectionName | default "http" | quote }}
|
sectionName: {{ $ref.sectionName | default "http" | quote }}
|
||||||
{{- with $ref.kind }}
|
{{- with $ref.kind }}
|
||||||
kind: {{ . | quote }}
|
kind: {{ . | quote }}
|
||||||
@@ -25,8 +26,8 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
# Default parentRef when parentRefs is empty or not set
|
# Default parentRef when parentRefs is empty or not set
|
||||||
- name: {{ .Values.gateway.name | default (printf "%s-gateway" (include "bentopdf.fullName" .)) | quote }}
|
- name: {{ .Values.gateway.name | default (printf "%s-gateway" (include "bentopdf.name" $)) | quote }}
|
||||||
namespace: {{ default .Release.Namespace .Values.gateway.namespace | quote }}
|
namespace: {{ .Values.gateway.namespace | default .Release.Namespace | quote }}
|
||||||
sectionName: "http"
|
sectionName: "http"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.httpRoute.hostnames }}
|
{{- with .Values.httpRoute.hostnames }}
|
||||||
@@ -37,14 +38,14 @@ spec:
|
|||||||
{{- range .Values.httpRoute.rules }}
|
{{- range .Values.httpRoute.rules }}
|
||||||
- {{- with .matches }}
|
- {{- with .matches }}
|
||||||
matches:
|
matches:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .filters }}
|
{{- with .filters }}
|
||||||
filters:
|
filters:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
backendRefs:
|
backendRefs:
|
||||||
- name: {{ include "bentopdf.fullname" }}
|
- name: {{ include "bentopdf.name" $ }}
|
||||||
port: {{ $.Values.service.port }}
|
port: {{ $.Values.service.port }}
|
||||||
weight: 1
|
weight: 1
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "bentopdf.fullname" . }}
|
name: {{ include "bentopdf.name" . }}
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "bentopdf.labels" . | nindent 4 }}
|
{{- include "bentopdf.labels" . | nindent 4 }}
|
||||||
{{- with .Values.ingress.annotations }}
|
{{- with .Values.ingress.annotations }}
|
||||||
@@ -35,7 +36,7 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: {{ include "bentopdf.fullname" $ }}
|
name: {{ include "bentopdf.name" $ }}
|
||||||
port:
|
port:
|
||||||
number: {{ $.Values.service.port }}
|
number: {{ $.Values.service.port }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "bentopdf.fullname" . }}
|
name: {{ include "bentopdf.name" . }}
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "bentopdf.labels" . | nindent 4 }}
|
{{- include "bentopdf.labels" . | nindent 4 }}
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
# The service account was removed, as it's not necessary for a chart like this.
|
|
||||||
#
|
|
||||||
# There are no calls to the Kubernetes API - routing between services.
|
|
||||||
# It's a simple nginx static website deployment only.
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{ include "bentopdf.fullname" . }}-test-connection"
|
name: "{{ include "bentopdf.name" . }}-test-connection"
|
||||||
labels:
|
labels:
|
||||||
{{- include "bentopdf.labels" . | nindent 4 }}
|
{{- include "bentopdf.labels" . | nindent 4 }}
|
||||||
annotations:
|
annotations:
|
||||||
@@ -11,5 +11,5 @@ spec:
|
|||||||
- name: wget
|
- name: wget
|
||||||
image: busybox
|
image: busybox
|
||||||
command: ['wget']
|
command: ['wget']
|
||||||
args: ['-qO-', 'http://{{ include "bentopdf.fullname" . }}:{{ .Values.service.port }}/']
|
args: ['-qO-', 'http://{{ include "bentopdf.name" . }}:{{ .Values.service.port }}/']
|
||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ image:
|
|||||||
|
|
||||||
imagePullSecrets: []
|
imagePullSecrets: []
|
||||||
nameOverride: ''
|
nameOverride: ''
|
||||||
fullnameOverride: ''
|
|
||||||
|
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
podLabels: {}
|
podLabels: {}
|
||||||
@@ -37,7 +36,7 @@ ingress:
|
|||||||
# Gateway API (optional)
|
# Gateway API (optional)
|
||||||
gateway:
|
gateway:
|
||||||
enabled: false
|
enabled: false
|
||||||
name: '' # default: release fullname + "-gateway" suffix
|
name: '' # default: release name + "-gateway" suffix
|
||||||
namespace: '' # to override the namespace
|
namespace: '' # to override the namespace
|
||||||
annotations: {}
|
annotations: {}
|
||||||
gatewayClassName: '' # required when enabled=true
|
gatewayClassName: '' # required when enabled=true
|
||||||
@@ -50,18 +49,17 @@ gateway:
|
|||||||
from: Same # Allow routes from the same namespace
|
from: Same # Allow routes from the same namespace
|
||||||
|
|
||||||
httpRoute:
|
httpRoute:
|
||||||
enabled: true
|
enabled: false
|
||||||
parentRefs:
|
annotations: {}
|
||||||
- name: existing-gateway
|
# parentRefs: # Omit entirely to use default (auto-references gateway in same namespace)
|
||||||
namespace: gateway-namespace
|
# - name: "" # default: gateway.name or {release-name}-gateway
|
||||||
sectionName: http
|
# namespace: "" # to override the namespace
|
||||||
|
# sectionName: "http"
|
||||||
hostnames:
|
hostnames:
|
||||||
- pdfs.example.com
|
- bentopdf.local
|
||||||
rules:
|
rules:
|
||||||
- matches:
|
- matches:
|
||||||
- path:
|
- path:
|
||||||
type: PathPrefix
|
|
||||||
value: /
|
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user