-
Notifications
You must be signed in to change notification settings - Fork 363
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move metrics-client-ca cm creation before prometheus-operator to be a…
…ble to progress The prometheus-operator itself is using an kube-rbac-proxy and therefore needs to have the client-ca for its deployment.
- Loading branch information
Showing
3 changed files
with
43 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package tasks | ||
|
||
import ( | ||
"github.com/openshift/cluster-monitoring-operator/pkg/client" | ||
"github.com/openshift/cluster-monitoring-operator/pkg/manifests" | ||
"github.com/pkg/errors" | ||
) | ||
|
||
type MetricsClientCATask struct { | ||
client *client.Client | ||
factory *manifests.Factory | ||
} | ||
|
||
// NewMetricsClientCATask returns and instance of MetricsClientCATask which creates | ||
// and updates the client-CA ConfigMap that is required by our deployments of the | ||
// kube-rbac-proxy in order to be able to authenticate client-cert authenticated | ||
// metrics requests | ||
func NewMetricsClientCATask(client *client.Client, factory *manifests.Factory) *MetricsClientCATask { | ||
return &MetricsClientCATask{ | ||
client: client, | ||
factory: factory, | ||
} | ||
} | ||
|
||
func (t *MetricsClientCATask) Run() error { | ||
apiAuthConfigmap, err := t.client.GetConfigmap("kube-system", "extension-apiserver-authentication") | ||
if err != nil { | ||
return errors.Wrap(err, "failed to load kube-system/extension-apiserver-authentication configmap") | ||
} | ||
|
||
cm, err := t.factory.MetricsClientCACM(apiAuthConfigmap) | ||
if err != nil { | ||
return errors.Wrap(err, "initializing Metrics Client CA failed") | ||
} | ||
|
||
err = t.client.CreateOrUpdateConfigMap(cm) | ||
if err != nil { | ||
return errors.Wrap(err, "reconciling Metrics Client CA ConfigMap failed") | ||
} | ||
|
||
return nil | ||
} |