Skip to content

Fixes for --early-readiness #175

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
mclasmeier merged 2 commits into from
May 13, 2026
Merged

Fixes for --early-readiness #175

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
4a5626e
Don't fail for main image tags containing commit IDs
May 13, 2026
70934f7
Make --early-readiness=true the default
May 13, 2026
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: 7 additions & 5 deletions internal/deployer/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ type CentralConfig struct {
// DefaultCentralConfig returns a CentralConfig with sensible defaults.
func DefaultCentralConfig() CentralConfig {
return CentralConfig{
DeployTimeout: DefaultCentralWaitTimeout,
Namespace: "acs-central",
DeployTimeout: DefaultCentralWaitTimeout,
Namespace: "acs-central",
EarlyReadiness: true,
Spec: map[string]interface{}{
"central": map[string]interface{}{
"telemetry": map[string]interface{}{
Expand Down Expand Up @@ -209,9 +210,10 @@ type SecuredClusterConfig struct {
// DefaultSecuredClusterConfig returns a SecuredClusterConfig with sensible defaults.
func DefaultSecuredClusterConfig() SecuredClusterConfig {
return SecuredClusterConfig{
DeployTimeout: DefaultSecuredClusterWaitTimeout,
Namespace: "acs-sensor",
Spec: make(map[string]interface{}),
DeployTimeout: DefaultSecuredClusterWaitTimeout,
Namespace: "acs-sensor",
EarlyReadiness: true,
Spec: make(map[string]interface{}),
}
}

Expand Down
3 changes: 3 additions & 0 deletions internal/stackroxversions/constraints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package stackroxversions

import (
"fmt"
"strings"

"github.com/Masterminds/semver/v3"
)
Expand All @@ -19,6 +20,8 @@ var (
// SupportsAdditionalPrinterColumns checks if the provided main image tag supports
// the additional printer columns (i.e., >= 4.9.0).
func SupportsAdditionalPrinterColumns(version string) (bool, error) {
// We also need to support versions such as 4.11.0-937-gf0da38f1a.
version, _, _ = strings.Cut(version, "-")
semVer, err := semver.NewVersion(version)
if err != nil {
return false, fmt.Errorf("failed to parse operator tag %q as semantic version: %w", version, err)
Expand Down
Loading