Merge pull request #208 from awgreene/update-collect-profile-namespace

openshift-merge-robot · web-flow · commit 6d684d4d9a85 · 2021-10-21T23:19:40.000Z
Bug 2016228: Use arguments to configure pprof-secret
diff --git a/cmd/collect-profiles/main.go b/cmd/collect-profiles/main.go
@@ -31,7 +31,6 @@ import (
 
 const (
 	profileConfigMapLabelKey = "olm.openshift.io/pprof"
-	olmNamespace             = "openshift-operator-lifecycle-manager"
 	pprofSecretName          = "pprof-cert"
 )
 
@@ -318,7 +317,7 @@ func requestURLBody(httpClient *http.Client, u *url.URL) ([]byte, error) {
 
 func populateServingCert(ctx context.Context, client client.Client) error {
 	secret := &corev1.Secret{}
-	err := client.Get(ctx, types.NamespacedName{Namespace: olmNamespace, Name: pprofSecretName}, secret)
+	err := client.Get(ctx, types.NamespacedName{Namespace: namespace, Name: pprofSecretName}, secret)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ import (`
`31`	`31`
`32`	`32`	`const (`
`33`	`33`	`profileConfigMapLabelKey = "olm.openshift.io/pprof"`
`34`		`- olmNamespace = "openshift-operator-lifecycle-manager"`
`35`	`34`	`pprofSecretName = "pprof-cert"`
`36`	`35`	`)`
`37`	`36`
`@@ -318,7 +317,7 @@ func requestURLBody(httpClient http.Client, u url.URL) ([]byte, error) {`
`318`	`317`
`319`	`318`	`func populateServingCert(ctx context.Context, client client.Client) error {`
`320`	`319`	`secret := &corev1.Secret{}`
`321`		`- err := client.Get(ctx, types.NamespacedName{Namespace: olmNamespace, Name: pprofSecretName}, secret)`
	`320`	`+ err := client.Get(ctx, types.NamespacedName{Namespace: namespace, Name: pprofSecretName}, secret)`
`322`	`321`	`if err != nil {`
`323`	`322`	`return err`
`324`	`323`	`}`