Skip to content

Commit 742ca02

Browse files
mclasmeierMoritz Clasmeier
andauthored
Fixes for --early-readiness (#175)
Co-authored-by: Moritz Clasmeier <mclasmeier@redhat.com>
1 parent f7cb07b commit 742ca02

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

internal/deployer/config.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ type CentralConfig struct {
9292
// DefaultCentralConfig returns a CentralConfig with sensible defaults.
9393
func DefaultCentralConfig() CentralConfig {
9494
return CentralConfig{
95-
DeployTimeout: DefaultCentralWaitTimeout,
96-
Namespace: "acs-central",
95+
DeployTimeout: DefaultCentralWaitTimeout,
96+
Namespace: "acs-central",
97+
EarlyReadiness: true,
9798
Spec: map[string]interface{}{
9899
"central": map[string]interface{}{
99100
"telemetry": map[string]interface{}{
@@ -209,9 +210,10 @@ type SecuredClusterConfig struct {
209210
// DefaultSecuredClusterConfig returns a SecuredClusterConfig with sensible defaults.
210211
func DefaultSecuredClusterConfig() SecuredClusterConfig {
211212
return SecuredClusterConfig{
212-
DeployTimeout: DefaultSecuredClusterWaitTimeout,
213-
Namespace: "acs-sensor",
214-
Spec: make(map[string]interface{}),
213+
DeployTimeout: DefaultSecuredClusterWaitTimeout,
214+
Namespace: "acs-sensor",
215+
EarlyReadiness: true,
216+
Spec: make(map[string]interface{}),
215217
}
216218
}
217219

internal/stackroxversions/constraints.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package stackroxversions
22

33
import (
44
"fmt"
5+
"strings"
56

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

0 commit comments

Comments
 (0)