Skip to content

Commit

Permalink
post merge fix
Browse files Browse the repository at this point in the history
Signed-off-by: Thibault Mange <[email protected]>
  • Loading branch information
thibaultmg committed Aug 21, 2024
1 parent 4d7860e commit 9c4a499
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion operators/endpointmetrics/pkg/microshift/microshift.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func (m *Microshift) renderScrapeConfig(res []*unstructured.Unstructured) error

// Append additional scrape config for etcd on the host
// We don't unmarshal the existing scrape config to avoid adding default values
// when marshalling the new scrape config. Instead, we append the new scrape config
// when marshaling the new scrape config. Instead, we append the new scrape config
// to the existing scrape config.
var ret strings.Builder
ret.WriteString(strings.TrimSpace(scrapeSecret.StringData[scrapeConfigKey]))
Expand Down
8 changes: 8 additions & 0 deletions operators/pkg/deploying/deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,10 @@ func (d *Deployer) updateAddOnDeploymentConfig(
desiredObj, runtimeObj *unstructured.Unstructured,
) error {
desiredAODC, runtimeAODC, err := unstructuredPairToTyped[addonv1alpha1.AddOnDeploymentConfig](desiredObj, runtimeObj)
if err != nil {
return err
}

if !apiequality.Semantic.DeepDerivative(desiredAODC.Spec, runtimeAODC.Spec) {
logUpdateInfo(runtimeObj)
if desiredAODC.ResourceVersion != runtimeAODC.ResourceVersion {
Expand All @@ -390,6 +394,10 @@ func (d *Deployer) updateClusterManagementAddOn(
desiredObj, runtimeObj *unstructured.Unstructured,
) error {
desiredCMAO, runtimeCMAO, err := unstructuredPairToTyped[addonv1alpha1.ClusterManagementAddOn](desiredObj, runtimeObj)
if err != nil {
return err
}

if !apiequality.Semantic.DeepDerivative(desiredCMAO.Spec, runtimeCMAO.Spec) {
logUpdateInfo(runtimeObj)
if desiredCMAO.ResourceVersion != runtimeCMAO.ResourceVersion {
Expand Down

0 comments on commit 9c4a499

Please sign in to comment.