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

Remove nativeGrpcHealthCheck from Helm chart #1840

Merged
merged 4 commits into from
Jun 15, 2023
Merged

Remove nativeGrpcHealthCheck from Helm chart #1840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0387123
Remove nativeGrpcHealthCheck from Helm chart
mathieu-benoit Jun 15, 2023
34669f8
Remove entirely nativeGrpcHealthCheck in Helm chart
mathieu-benoit Jun 15, 2023
e7c30dc
Update Chart.yaml to 0.8.0
NimJay Jun 15, 2023
48fd7c0
Merge branch 'main' into patch-2
NimJay Jun 15, 2023
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
4 changes: 2 additions & 2 deletions helm-chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.0
version: 0.8.0

# 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.
# It is recommended to use it with quotes.
appVersion: "v0.7.0"
appVersion: "v0.8.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heads-up:
I've bumped this to 0.8.0 because I don't think the updates to the Helm charts will work on Online Boutique's 0.7.0 images.
I will be building and pushing the 0.8.0 images shortly.

14 changes: 0 additions & 14 deletions helm-chart/templates/adservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.adService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.adService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 9555
env:
Expand All @@ -66,23 +62,13 @@ spec:
readinessProbe:
initialDelaySeconds: 20
periodSeconds: 15
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 9555
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:9555"]
{{- end }}
livenessProbe:
initialDelaySeconds: 20
periodSeconds: 15
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 9555
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:9555"]
{{- end }}
---
apiVersion: v1
kind: Service
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/cartservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.cartService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.cartService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 7070
env:
Expand All @@ -73,23 +69,13 @@ spec:
{{- toYaml .Values.cartService.resources | nindent 10 }}
readinessProbe:
initialDelaySeconds: 15
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 7070
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:7070", "-rpc-timeout=5s"]
{{- end }}
livenessProbe:
initialDelaySeconds: 15
periodSeconds: 10
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 7070
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:7070", "-rpc-timeout=5s"]
{{- end }}
---
apiVersion: v1
kind: Service
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/checkoutservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,15 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.checkoutService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.checkoutService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 5050
readinessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 5050
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:5050"]
{{- end }}
livenessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 5050
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:5050"]
{{- end }}
env:
- name: PORT
value: "5050"
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/currencyservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.currencyService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.currencyService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- name: grpc
containerPort: 7000
Expand All @@ -75,21 +71,11 @@ spec:
value: "1"
{{- end }}
readinessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 7000
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:7000"]
{{- end }}
livenessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 7000
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:7000"]
{{- end }}
resources:
{{- toYaml .Values.currencyService.resources | nindent 10 }}
---
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/emailservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.emailService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.emailService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 8080
env:
Expand All @@ -75,22 +71,12 @@ spec:
{{- end }}
readinessProbe:
periodSeconds: 5
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 8080
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:8080"]
{{- end }}
livenessProbe:
periodSeconds: 5
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 8080
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:8080"]
{{- end }}
resources:
{{- toYaml .Values.emailService.resources | nindent 10 }}
---
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/paymentservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.paymentService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.paymentService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 50051
env:
Expand All @@ -74,21 +70,11 @@ spec:
value: "1"
{{- end }}
readinessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 50051
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:50051"]
{{- end }}
livenessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 50051
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:50051"]
{{- end }}
resources:
{{- toYaml .Values.paymentService.resources | nindent 10 }}
---
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/productcatalogservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.productCatalogService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.productCatalogService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 3550
env:
Expand All @@ -76,21 +72,11 @@ spec:
- name: EXTRA_LATENCY
value: {{ .Values.productCatalogService.extraLatency }}
readinessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 3550
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:3550"]
{{- end }}
livenessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 3550
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:3550"]
{{- end }}
resources:
{{- toYaml .Values.productCatalogService.resources | nindent 10 }}
---
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/recommendationservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,17 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.recommendationService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.recommendationService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 8080
readinessProbe:
periodSeconds: 5
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 8080
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:8080"]
{{- end }}
livenessProbe:
periodSeconds: 5
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 8080
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:8080"]
{{- end }}
env:
- name: PORT
value: "8080"
Expand Down
14 changes: 0 additions & 14 deletions helm-chart/templates/shippingservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ spec:
- ALL
privileged: false
readOnlyRootFilesystem: true
{{- if .Values.nativeGrpcHealthCheck }}
image: {{ .Values.images.repository }}/{{ .Values.shippingService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}-native-grpc-probes
{{- else }}
image: {{ .Values.images.repository }}/{{ .Values.shippingService.name }}:{{ .Values.images.tag | default .Chart.AppVersion }}
{{- end }}
ports:
- containerPort: 50051
env:
Expand All @@ -66,21 +62,11 @@ spec:
{{- end }}
readinessProbe:
periodSeconds: 5
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 50051
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:50051"]
{{- end }}
livenessProbe:
{{- if .Values.nativeGrpcHealthCheck }}
grpc:
port: 50051
{{- else }}
exec:
command: ["/bin/grpc_health_probe", "-addr=:50051"]
{{- end }}
resources:
{{- toYaml .Values.shippingService.resources | nindent 10 }}
---
Expand Down
3 changes: 0 additions & 3 deletions helm-chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ serviceAccounts:
# Annotations to add only for the cartservice app. This allows to follow the least privilege principle where only cartservice needs to connect to external database for example via Workload Identity.
annotationsOnlyForCartservice: false

# Specifies if the livenessProbe and readinessProbe are using the native gRPC support with Kubernetes 1.24.
nativeGrpcHealthCheck: false

networkPolicies:
# Specifies if the NetworkPolicies are created or not. If true, one fine granular NetworkPolicy per app is created.
create: false
Expand Down