Skip to content

Commit 19928f2

Browse files
committed
OCPBUGS-45895: allow reconciling existing Secrets
Until now, CMO did not reconcile existing secrets, even if their data changed. This changes that behavior. Signed-off-by: Pranshu Srivastava <[email protected]>
1 parent 5bfa3b9 commit 19928f2

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

pkg/tasks/alertmanager.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (t *AlertmanagerTask) create(ctx context.Context) error {
101101
return fmt.Errorf("initializing Alertmanager RBAC proxy Secret failed: %w", err)
102102
}
103103

104-
err = t.client.CreateIfNotExistSecret(ctx, rs)
104+
err = t.client.CreateOrUpdateSecret(ctx, rs)
105105
if err != nil {
106106
return fmt.Errorf("creating Alertmanager RBAC proxy Secret failed: %w", err)
107107
}
@@ -111,7 +111,7 @@ func (t *AlertmanagerTask) create(ctx context.Context) error {
111111
return fmt.Errorf("initializing Alertmanager RBAC proxy metric Secret failed: %w", err)
112112
}
113113

114-
err = t.client.CreateIfNotExistSecret(ctx, rsm)
114+
err = t.client.CreateOrUpdateSecret(ctx, rsm)
115115
if err != nil {
116116
return fmt.Errorf("creating Alertmanager RBAC proxy metric Secret failed: %w", err)
117117
}
@@ -163,7 +163,7 @@ func (t *AlertmanagerTask) create(ctx context.Context) error {
163163
return fmt.Errorf("initializing Alertmanager proxy web Secret failed: %w", err)
164164
}
165165

166-
err = t.client.CreateIfNotExistSecret(ctx, ps)
166+
err = t.client.CreateOrUpdateSecret(ctx, ps)
167167
if err != nil {
168168
return fmt.Errorf("creating Alertmanager proxy web Secret failed: %w", err)
169169
}

pkg/tasks/alertmanager_user_workload.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (t *AlertmanagerUserWorkloadTask) create(ctx context.Context) error {
8080
return fmt.Errorf("initializing Alertmanager User Workload RBAC proxy Secret failed: %w", err)
8181
}
8282

83-
err = t.client.CreateIfNotExistSecret(ctx, s)
83+
err = t.client.CreateOrUpdateSecret(ctx, s)
8484
if err != nil {
8585
return fmt.Errorf("creating Alertmanager User Workload RBAC proxy Secret failed: %w", err)
8686
}
@@ -90,7 +90,7 @@ func (t *AlertmanagerUserWorkloadTask) create(ctx context.Context) error {
9090
return fmt.Errorf("initializing Alertmanager User Workload RBAC proxy tenancy Secret failed: %w", err)
9191
}
9292

93-
err = t.client.CreateIfNotExistSecret(ctx, s)
93+
err = t.client.CreateOrUpdateSecret(ctx, s)
9494
if err != nil {
9595
return fmt.Errorf("creating Alertmanager User Workload RBAC proxy tenancy Secret failed: %w", err)
9696
}
@@ -100,7 +100,7 @@ func (t *AlertmanagerUserWorkloadTask) create(ctx context.Context) error {
100100
return fmt.Errorf("initializing Alertmanager User Workload RBAC proxy metric Secret failed: %w", err)
101101
}
102102

103-
err = t.client.CreateIfNotExistSecret(ctx, rsm)
103+
err = t.client.CreateOrUpdateSecret(ctx, rsm)
104104
if err != nil {
105105
return fmt.Errorf("creating Alertmanager User Workload RBAC proxy metric Secret failed: %w", err)
106106
}

pkg/tasks/kubestatemetrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (t *KubeStateMetricsTask) Run(ctx context.Context) error {
7070
return fmt.Errorf("initializing kube-state-metrics RBAC proxy Secret failed: %w", err)
7171
}
7272

73-
err = t.client.CreateIfNotExistSecret(ctx, rs)
73+
err = t.client.CreateOrUpdateSecret(ctx, rs)
7474
if err != nil {
7575
return fmt.Errorf("creating kube-state-metrics RBAC proxy Secret failed: %w", err)
7676
}

pkg/tasks/nodeexporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (t *NodeExporterTask) Run(ctx context.Context) error {
8080
return fmt.Errorf("intializing node-exporter rbac proxy secret failed: %w", err)
8181
}
8282

83-
err = t.client.CreateIfNotExistSecret(ctx, nes)
83+
err = t.client.CreateOrUpdateSecret(ctx, nes)
8484
if err != nil {
8585
return fmt.Errorf("creating node-exporter rbac proxy secret failed: %w", err)
8686
}

pkg/tasks/openshiftstatemetrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (t *OpenShiftStateMetricsTask) Run(ctx context.Context) error {
8080
return fmt.Errorf("initializing openshift-state-metrics RBAC proxy Secret failed: %w", err)
8181
}
8282

83-
err = t.client.CreateIfNotExistSecret(ctx, rs)
83+
err = t.client.CreateOrUpdateSecret(ctx, rs)
8484
if err != nil {
8585
return fmt.Errorf("creating openshift-state-metrics RBAC proxy Secret failed: %w", err)
8686
}

pkg/tasks/prometheusoperator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (t *PrometheusOperatorTask) Run(ctx context.Context) error {
8585
return fmt.Errorf("initializing Prometheus Operator RBAC proxy Secret failed: %w", err)
8686
}
8787

88-
err = t.client.CreateIfNotExistSecret(ctx, rs)
88+
err = t.client.CreateOrUpdateSecret(ctx, rs)
8989
if err != nil {
9090
return fmt.Errorf("creating Prometheus Operator RBAC proxy Secret failed: %w", err)
9191
}

pkg/tasks/thanos_querier.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (t *ThanosQuerierTask) Run(ctx context.Context) error {
7373
return fmt.Errorf("initializing Thanos Querier RBAC proxy Secret failed: %w", err)
7474
}
7575

76-
err = t.client.CreateIfNotExistSecret(ctx, rs)
76+
err = t.client.CreateOrUpdateSecret(ctx, rs)
7777
if err != nil {
7878
return fmt.Errorf("creating Thanos Querier RBAC proxy Secret failed: %w", err)
7979
}
@@ -83,7 +83,7 @@ func (t *ThanosQuerierTask) Run(ctx context.Context) error {
8383
return fmt.Errorf("initializing Thanos Querier RBAC proxy rules Secret failed: %w", err)
8484
}
8585

86-
err = t.client.CreateIfNotExistSecret(ctx, rs)
86+
err = t.client.CreateOrUpdateSecret(ctx, rs)
8787
if err != nil {
8888
return fmt.Errorf("creating Thanos Querier RBAC proxy rules Secret failed: %w", err)
8989
}
@@ -93,7 +93,7 @@ func (t *ThanosQuerierTask) Run(ctx context.Context) error {
9393
return fmt.Errorf("initializing Thanos Querier RBAC proxy metrics Secret failed: %w", err)
9494
}
9595

96-
err = t.client.CreateIfNotExistSecret(ctx, rs)
96+
err = t.client.CreateOrUpdateSecret(ctx, rs)
9797
if err != nil {
9898
return fmt.Errorf("creating Thanos Querier RBAC proxy metrics Secret failed: %w", err)
9999
}

0 commit comments

Comments
 (0)