Skip to content

OCPBUGS-112062: fix: use native gRPC probes for CatalogSource pods [release-4.22] #1356

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

Open
twoGiants wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
Open

OCPBUGS-112062: fix: use native gRPC probes for CatalogSource pods [release-4.22] #1356

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,26 +158,26 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name, opmImg, utilImage, img s
},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: readinessDelay,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: livenessDelay,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down
112 changes: 56 additions & 56 deletions staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestPodMemoryTarget(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "KpDeU9UesY5GlqG7ZUg9deo8Jp7mEGdpBhGJn", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "b5nr2RkG6B45bx5Cn63j7B5ybVGjvneXC0AGu7", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand All @@ -49,26 +49,26 @@ func TestPodMemoryTarget(t *testing.T) {
Ports: []corev1.ContainerPort{{Name: "grpc", ContainerPort: 50051}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down Expand Up @@ -110,7 +110,7 @@ func TestPodMemoryTarget(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "1Cl0FkZ1FdtjQ91Ojcj7pM0MphZFlOuLPtz2Cu", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "62b6r57eNVnmLZo0glbfT9JJHn98HcJzBhZN94", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand All @@ -122,26 +122,26 @@ func TestPodMemoryTarget(t *testing.T) {
Env: []corev1.EnvVar{{Name: "GOMEMLIMIT", Value: "5MiB"}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down Expand Up @@ -209,7 +209,7 @@ func TestPodExtractContent(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "KpDeU9UesY5GlqG7ZUg9deo8Jp7mEGdpBhGJn", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "b5nr2RkG6B45bx5Cn63j7B5ybVGjvneXC0AGu7", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand All @@ -220,26 +220,26 @@ func TestPodExtractContent(t *testing.T) {
Ports: []corev1.ContainerPort{{Name: "grpc", ContainerPort: 50051}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down Expand Up @@ -285,7 +285,7 @@ func TestPodExtractContent(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "9SbEBzbV5JmBIA6zza29T4lIo0ESVJ8SN6slOY", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "7RONLG0R9WhWbcfGQvcwjexvGmZhN0Hyl16mHH", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -341,26 +341,26 @@ func TestPodExtractContent(t *testing.T) {
Ports: []corev1.ContainerPort{{Name: "grpc", ContainerPort: 50051}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down Expand Up @@ -406,7 +406,7 @@ func TestPodExtractContent(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "1B9AFU7EIoI0CgRaHbyBL3EnGzwrkBq968SSps", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "8GtO2FTxu9llB1icRoWQIinKIVmNcrtivDihGG", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -464,26 +464,26 @@ func TestPodExtractContent(t *testing.T) {
Ports: []corev1.ContainerPort{{Name: "grpc", ContainerPort: 50051}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down Expand Up @@ -522,7 +522,7 @@ func TestPodExtractContent(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "8qB6OcFt60v8HdhXnPkB1cjF39t7RkFx9K0JxW", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "8MrvWgiEdqXHHX9wiYJTEe8NgdSQYTVQtOnqml", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand All @@ -533,26 +533,26 @@ func TestPodExtractContent(t *testing.T) {
Ports: []corev1.ContainerPort{{Name: "grpc", ContainerPort: 50051}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down Expand Up @@ -605,7 +605,7 @@ func TestPodExtractContent(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "3xuLPXGJ2pzekw21PFU68XUKOYc7PTuW45M521", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "30zwNEAtF3RcZ94bM4MzA64LwQ8ikpEyrQHTd6", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -665,26 +665,26 @@ func TestPodExtractContent(t *testing.T) {
Ports: []corev1.ContainerPort{{Name: "grpc", ContainerPort: 50051}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down Expand Up @@ -737,7 +737,7 @@ func TestPodExtractContent(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Namespace: "testns",
Labels: map[string]string{"olm.pod-spec-hash": "7noQSgGmkI4BD1MPKe0pEFFfOE3jJtN2DUyZuD", "olm.managed": "true"},
Labels: map[string]string{"olm.pod-spec-hash": "G21gfJ9Iz3wyOmy5eBn7kFuqBv93zGJP5lFEM", "olm.managed": "true"},
Annotations: map[string]string{"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -799,26 +799,26 @@ func TestPodExtractContent(t *testing.T) {
Ports: []corev1.ContainerPort{{Name: "grpc", ContainerPort: 50051}},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: 0,
TimeoutSeconds: 5,
},
StartupProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051", "-rpc-timeout=5s"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
FailureThreshold: 10,
Expand Down
8 changes: 4 additions & 4 deletions staging/operator-lifecycle-manager/test/e2e/magic_catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,17 +293,17 @@ func (c *MagicCatalog) makeCatalogSourcePod() *corev1.Pod {
},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: readinessDelay,
TimeoutSeconds: 5,
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{"grpc_health_probe", "-addr=:50051"},
GRPC: &corev1.GRPCAction{
Port: 50051,
},
},
InitialDelaySeconds: livenessDelay,
Expand Down
Loading