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

resourcegen: always use https startup probe for web pod #784

Merged
merged 1 commit into from
Aug 5, 2024
Merged

resourcegen: always use https startup probe for web pod #784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions internal/kuberesource/sets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,22 +192,19 @@ func GenpolicyRegressionTests() map[string]*applyappsv1.DeploymentApplyConfigura
func Emojivoto(smMode serviceMeshMode) []any {
ns := ""
var emojiSvcImage, emojiVotingSvcImage, emojiWebImage, emojiWebVoteBotImage, emojiSvcHost, votingSvcHost string
var httpProbeScheme corev1.URIScheme
switch smMode {
case ServiceMeshDisabled:
emojiSvcImage = "ghcr.io/3u13r/emojivoto-emoji-svc:coco-1"
emojiVotingSvcImage = "ghcr.io/3u13r/emojivoto-voting-svc:coco-1"
emojiWebImage = "ghcr.io/3u13r/emojivoto-web:coco-1"
emojiWebVoteBotImage = emojiWebImage
httpProbeScheme = corev1.URISchemeHTTP
emojiSvcHost = "emoji-svc:8080"
votingSvcHost = "voting-svc:8080"
case ServiceMeshIngressEgress:
emojiSvcImage = "docker.io/buoyantio/emojivoto-emoji-svc:v11"
emojiVotingSvcImage = "docker.io/buoyantio/emojivoto-voting-svc:v11"
emojiWebImage = "docker.io/buoyantio/emojivoto-web:v11"
emojiWebVoteBotImage = "ghcr.io/3u13r/emojivoto-web:coco-1"
httpProbeScheme = corev1.URISchemeHTTPS
emojiSvcHost = "127.137.0.1:8081"
votingSvcHost = "127.137.0.2:8081"
default:
Expand Down Expand Up @@ -433,7 +430,7 @@ func Emojivoto(smMode serviceMeshMode) []any {
WithReadinessProbe(applycorev1.Probe().
WithHTTPGet(applycorev1.HTTPGetAction().
WithPort(intstr.FromInt(8080)).
WithScheme(httpProbeScheme),
WithScheme(corev1.URISchemeHTTPS),
).
WithInitialDelaySeconds(1).
WithPeriodSeconds(5),
Expand Down
Loading