Merge branch 'main' into renaming-tool

redhat-best-practices-for-k8s · Aug 29, 2024 · 3be8d60 · 3be8d60
2 parents 2941924 + 943de54
commit 3be8d60
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/ubi:9.4-1181@sha256:1ee4d8c50d14d9c9e9229d9a039d793fcbc9aa803806d194c957a397cf1d2b17 AS build
+FROM registry.access.redhat.com/ubi9/ubi:9.4-1181.1724035907@sha256:9e6a89ab2a9224712391c77fab2ab01009e387aff42854826427aaf18b98b1ff AS build
 ENV CERTSUITE_DIR=/usr/certsuite
 ENV \
 	CERTSUITE_SRC_DIR=${CERTSUITE_DIR}/src \

diff --git a/cmd/certsuite/run/run.go b/cmd/certsuite/run/run.go
@@ -40,7 +40,7 @@ func NewCommand() *cobra.Command {
 	runCmd.PersistentFlags().Bool("enable-data-collection", false, "Allow sending test results to an external data collector")
 	runCmd.PersistentFlags().Bool("create-xml-junit-file", false, "Create a JUnit file with the test results")
 	runCmd.PersistentFlags().String("certsuite-image-repository", "quay.io/redhat-best-practices-for-k8s", "The repository where Certsuite images are stored")
-	runCmd.PersistentFlags().String("certsuite-debug-image", "certsuite-probe:v0.0.7", "Name of the certsuite-probe image")
+	runCmd.PersistentFlags().String("certsuite-probe-image-repository", "certsuite-probe:v0.0.7", "Name of the certsuite-probe image")
 	runCmd.PersistentFlags().String("daemonset-cpu-req", "100m", "CPU request for the debug DaemonSet container")
 	runCmd.PersistentFlags().String("daemonset-cpu-lim", "100m", "CPU limit for the debug DaemonSet container")
 	runCmd.PersistentFlags().String("daemonset-mem-req", "100M", "Memory request for the debug DaemonSet container")
@@ -68,8 +68,8 @@ func initTestParamsFromFlags(cmd *cobra.Command) error {
 	testParams.IncludeWebFilesInOutputFolder, _ = cmd.Flags().GetBool("include-web-files")
 	testParams.EnableDataCollection, _ = cmd.Flags().GetBool("enable-data-collection")
 	testParams.EnableXMLCreation, _ = cmd.Flags().GetBool("create-xml-junit-file")
-	testParams.CertsuiteImageRepo, _ = cmd.Flags().GetString("certsuite-image-repository")
-	testParams.CertsuiteDebugImage, _ = cmd.Flags().GetString("certsuite-debug-image")
+	testParams.CertSuiteImageRepo, _ = cmd.Flags().GetString("certsuite-image-repository")
+	testParams.CertSuiteProbeImage, _ = cmd.Flags().GetString("certsuite-probe-image-repository")
 	testParams.DaemonsetCPUReq, _ = cmd.Flags().GetString("daemonset-cpu-req")
 	testParams.DaemonsetCPULim, _ = cmd.Flags().GetString("daemonset-cpu-lim")
 	testParams.DaemonsetMemReq, _ = cmd.Flags().GetString("daemonset-mem-req")

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/redhat-best-practices-for-k8s/certsuite
 go 1.22.6
 
 require (
-	github.com/Masterminds/semver/v3 v3.2.1
+	github.com/Masterminds/semver/v3 v3.3.0
 	github.com/redhat-best-practices-for-k8s/certsuite-claim v1.0.47
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1

diff --git a/go.sum b/go.sum
@@ -13,8 +13,8 @@ github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy86
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
-github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
+github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
+github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
 github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
 github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=

diff --git a/pkg/configuration/configuration.go b/pkg/configuration/configuration.go
@@ -107,8 +107,8 @@ type TestParameters struct {
 	DaemonsetMemReq               string
 	DaemonsetMemLim               string
 	SanitizeClaim                 bool
-	CertsuiteImageRepo            string
-	CertsuiteDebugImage           string
+	CertSuiteImageRepo            string
+	CertSuiteProbeImage           string
 	NonIntrusiveOnly              bool
 	AllowPreflightInsecure        bool
 	IncludeWebFilesInOutputFolder bool

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -181,7 +181,7 @@ var (
 func deployDaemonSet(namespace string) error {
 	k8sPrivilegedDs.SetDaemonSetClient(clientsholder.GetClientsHolder().K8sClient)
 
-	dsImage := env.params.CertsuiteImageRepo + "/" + env.params.CertsuiteDebugImage
+	dsImage := env.params.CertSuiteImageRepo + "/" + env.params.CertSuiteProbeImage
 	if k8sPrivilegedDs.IsDaemonSetReady(DaemonSetName, namespace, dsImage) {
 		return nil
 	}
@@ -196,11 +196,11 @@ func deployDaemonSet(namespace string) error {
 		configuration.GetTestParameters().DaemonsetMemLim,
 	)
 	if err != nil {
-		return fmt.Errorf("could not deploy tnf daemonset, err=%v", err)
+		return fmt.Errorf("could not deploy certsuite daemonset, err=%v", err)
 	}
 	err = k8sPrivilegedDs.WaitDaemonsetReady(namespace, DaemonSetName, debugPodsTimeout)
 	if err != nil {
-		return fmt.Errorf("timed out waiting for tnf daemonset, err=%v", err)
+		return fmt.Errorf("timed out waiting for certsuite daemonset, err=%v", err)
 	}
 
 	return nil