Skip to content

NO-JIRA: Remove kas from EnsureNoCrashingPods exceptions #5946

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

Merged
openshift-merge-bot merged 2 commits into from
Apr 21, 2025
Merged

NO-JIRA: Remove kas from EnsureNoCrashingPods exceptions #5946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b597610
Remove kas from EnsureNoCrashingPods exceptions
enxebre Apr 1, 2025
466036f
Increase kas bootstrap poll time
enxebre Apr 9, 2025
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
7 changes: 4 additions & 3 deletions kas-bootstrap/kas_boostrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ func run(ctx context.Context, opts Options) error {

// This binary is meant to run next to the KAS container within the same pod.
// We briefly poll here to retry on race and transient network issues.
// This to avoid unnecessary restarts of this container.
if err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 20*time.Second, true,
// 50s is a high margin chosen here as in CI aws kms is observed to take up to 30s to start.
// This to avoid unncessary restarts of this container.
if err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 50*time.Second, true,
func(ctx context.Context) (done bool, err error) {
if err := applyBootstrapResources(ctx, c, opts.ResourcesPath); err != nil {
logger.Error(err, "failed to apply bootstrap resources, retrying")
Expand All @@ -78,7 +79,7 @@ func run(ctx context.Context, opts Options) error {
return fmt.Errorf("failed to parse featureGate file: %w", err)
}

if err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 20*time.Second, true,
if err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 50*time.Second, true,
func(ctx context.Context) (done bool, err error) {
if err := reconcileFeatureGate(ctx, c, renderedFeatureGate); err != nil {
logger.Error(err, "failed to reconcile featureGate, retrying")
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,6 @@ func EnsureNoCrashingPods(t *testing.T, ctx context.Context, client crclient.Cli
t.Fatalf("failed to list pods in namespace %s: %v", namespace, err)
}
for _, pod := range podList.Items {
// TODO(alberto): Remove this once we move the kasContainerApplyBootstrap logic into the kas-bootstrap binary.
if strings.HasPrefix(pod.Name, "kube-apiserver") {
continue
}
// TODO: Figure out why Karpenter needs restaring some times https://issues.redhat.com/browse/HOSTEDCP-2254.
if strings.HasPrefix(pod.Name, "karpenter") {
continue
Expand Down