Skip to content

Commit

Permalink
ci: fixed application names
Browse files Browse the repository at this point in the history
  • Loading branch information
daystram committed Feb 14, 2021
1 parent ec139df commit 93daf83
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
20 changes: 10 additions & 10 deletions .daystram/helm-chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "folio.fullname" . }}-be
name: {{ include "ratify.fullname" . }}-be
labels:
{{- include "folio.labels" . | nindent 4 }}
{{- include "ratify.labels" . | nindent 4 }}
tier: be
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.ratify.be.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "folio.selectorLabels" . | nindent 6 }}
{{- include "ratify.selectorLabels" . | nindent 6 }}
tier: be
template:
metadata:
Expand All @@ -21,14 +21,14 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "folio.selectorLabels" . | nindent 8 }}
{{- include "ratify.selectorLabels" . | nindent 8 }}
tier: be
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "folio.serviceAccountName" . }}
serviceAccountName: {{ include "ratify.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
Expand Down Expand Up @@ -63,17 +63,17 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "folio.fullname" . }}-fe
name: {{ include "ratify.fullname" . }}-fe
labels:
{{- include "folio.labels" . | nindent 4 }}
{{- include "ratify.labels" . | nindent 4 }}
tier: fe
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.ratify.fe.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "folio.selectorLabels" . | nindent 6 }}
{{- include "ratify.selectorLabels" . | nindent 6 }}
tier: fe
template:
metadata:
Expand All @@ -82,14 +82,14 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "folio.selectorLabels" . | nindent 8 }}
{{- include "ratify.selectorLabels" . | nindent 8 }}
tier: fe
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "folio.serviceAccountName" . }}
serviceAccountName: {{ include "ratify.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
Expand Down
16 changes: 8 additions & 8 deletions .daystram/helm-chart/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: {{ include "folio.fullname" . }}
name: {{ include "ratify.fullname" . }}
labels:
{{- include "folio.labels" . | nindent 4 }}
{{- include "ratify.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand All @@ -16,28 +16,28 @@ spec:
- kind: Rule
match: "Host(`{{ .Values.ingress.host }}`)"
services:
- name: {{ include "folio.fullname" . }}-fe
- name: {{ include "ratify.fullname" . }}-fe
passHostHeader: true
port: {{ .Values.service.port }}
middlewares:
- name: gzip
- kind: Rule
match: "Host(`{{ .Values.ingress.host }}`) && PathPrefix(`/api`)"
services:
- name: {{ include "folio.fullname" . }}-be
- name: {{ include "ratify.fullname" . }}-be
passHostHeader: true
port: {{ .Values.service.port }}
- kind: Rule
match: "Host(`{{ .Values.ingress.host }}`) && PathPrefix(`/oauth`)"
services:
- name: {{ include "folio.fullname" . }}-be
- name: {{ include "ratify.fullname" . }}-be
passHostHeader: true
port: {{ .Values.service.port }}
middlewares:
- name: cors
{{- if .Values.ingress.tls }}
tls:
secretName: cert-{{ include "folio.fullname" . }}
secretName: cert-{{ include "ratify.fullname" . }}
{{- end }}

---
Expand Down Expand Up @@ -75,9 +75,9 @@ spec:
apiVersion: cert-manager.io/v1alpha2
kind: Certificate
metadata:
name: cert-{{ include "folio.fullname" . }}
name: cert-{{ include "ratify.fullname" . }}
spec:
secretName: cert-{{ include "folio.fullname" . }}
secretName: cert-{{ include "ratify.fullname" . }}
dnsNames:
- {{ .Values.ingress.host }}
issuerRef:
Expand Down
12 changes: 6 additions & 6 deletions .daystram/helm-chart/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "folio.fullname" . }}-fe
name: {{ include "ratify.fullname" . }}-fe
labels:
{{- include "folio.labels" . | nindent 4 }}
{{- include "ratify.labels" . | nindent 4 }}
tier: fe
spec:
type: {{ .Values.service.type }}
Expand All @@ -13,16 +13,16 @@ spec:
protocol: TCP
name: http
selector:
{{- include "folio.selectorLabels" . | nindent 4 }}
{{- include "ratify.selectorLabels" . | nindent 4 }}
tier: fe

---
apiVersion: v1
kind: Service
metadata:
name: {{ include "folio.fullname" . }}-be
name: {{ include "ratify.fullname" . }}-be
labels:
{{- include "folio.labels" . | nindent 4 }}
{{- include "ratify.labels" . | nindent 4 }}
tier: be
spec:
type: {{ .Values.service.type }}
Expand All @@ -32,5 +32,5 @@ spec:
protocol: TCP
name: http
selector:
{{- include "folio.selectorLabels" . | nindent 4 }}
{{- include "ratify.selectorLabels" . | nindent 4 }}
tier: be

0 comments on commit 93daf83

Please sign in to comment.