From 07104694a2e732b2c416d86b3c94140dbce0a7c6 Mon Sep 17 00:00:00 2001 From: Jeremy Facchetti Date: Thu, 2 Jun 2022 13:16:56 +0200 Subject: [PATCH] fixed conflict created when moving to the new library --- pkg/operator/controllers/machinehealthcheck/bindata.go | 2 +- .../staticresources/mhcremediationalert.yaml | 2 +- pkg/operator/controllers/muo/muo_controller_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/operator/controllers/machinehealthcheck/bindata.go b/pkg/operator/controllers/machinehealthcheck/bindata.go index 73ea4bd26ed..e3e0183a5af 100644 --- a/pkg/operator/controllers/machinehealthcheck/bindata.go +++ b/pkg/operator/controllers/machinehealthcheck/bindata.go @@ -98,7 +98,7 @@ func machinehealthcheckYaml() (*asset, error) { return a, nil } -var _mhcremediationalertYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x91\x4d\x8b\x14\x4d\x10\x84\xef\xfd\x2b\xe2\xf8\xbe\x87\x5e\x5d\x0f\x22\x75\x10\x44\x84\xbd\x2c\xc8\x08\x5e\x44\x86\x9c\xea\x70\xaa\x98\xfa\x68\x32\xb3\x67\xdd\x7f\x2f\xdd\xd3\xea\x5e\xcc\x63\x55\x3e\x11\x4f\x51\x32\xe7\xaf\x54\xcb\xbd\x05\xd4\xde\xb2\x77\xcd\xed\x7c\x17\xbb\xb2\xdb\x5d\xec\xf5\xd5\xf5\x7e\xb8\xe4\x36\x05\x7c\xd6\x5e\xe9\x89\x8b\x1d\x96\xc2\xa1\xd2\x65\x12\x97\x30\x00\x4d\x2a\x03\x6a\x8a\xa3\xb2\x72\xca\xe2\xb9\xb7\x51\x0a\xd5\xf7\x5b\x9b\x25\x32\xa0\xcf\x6c\x96\xf2\x0f\x1f\xab\xc4\x94\x1b\x47\x99\xf3\x00\x14\x39\xb1\xd8\x1a\x05\xcc\x7f\x7a\x02\x2e\xef\x6c\x3b\xd3\x5e\x18\xb0\x05\x8e\xba\x14\xda\x60\x33\xe3\xba\x7f\xd6\xbe\xcc\x1b\x39\xee\x1a\xa6\x1c\xff\xa5\x02\x6c\xf4\xad\x68\xbc\x05\x06\x7c\x39\x7c\x7a\xbc\xe9\x3c\x50\x8a\xa7\x8f\x89\xf1\x72\xf8\x8b\x1f\xc4\xf9\x90\xcf\x69\xa3\x00\xfe\x9c\x35\x20\xb7\xa8\x14\xe3\x7f\x55\xe6\x7c\xdc\x9f\x93\x36\x3e\xae\xfc\xf1\x45\xff\xd1\x96\x18\x69\x76\xf4\xee\x52\xf0\xed\xed\xeb\xfa\xfd\x7f\xbc\xc7\xfd\x9e\xf8\xa1\xb5\xee\xdb\xe6\xae\xb6\xce\x23\xcd\xe4\xcc\x00\x3c\x75\xbd\x50\xd1\xfa\x44\x43\x92\x2b\x71\x22\x1b\x7e\x17\x70\xc2\x1b\x74\x45\xed\x4a\x78\xae\x34\xe4\x06\x4f\x44\x11\x73\xa4\xbe\x28\x3c\x65\x43\x95\x67\xe4\x36\xe5\x28\x4e\x48\xc3\xd2\xcc\xe5\x54\xb8\x15\x94\x2e\x13\x74\x69\x2d\xb7\x33\xfa\x8d\x8f\x65\x31\xa7\xee\x4a\x2f\x3f\x69\x1d\xe3\x95\x9a\xfd\x39\xe0\x49\x74\xc5\x86\x5f\x01\x00\x00\xff\xff\x76\x45\x90\xe0\x4e\x02\x00\x00") +var _mhcremediationalertYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x91\x4d\x8b\x14\x4d\x10\x84\xef\xfd\x2b\xe2\xf8\xbe\x87\x5e\x5d\x0f\x22\x75\x10\x44\x84\xbd\x2c\xc8\x08\x5e\x44\x86\x9c\xea\x70\xaa\x98\xfa\x68\x32\xb3\x67\xdd\x7f\x2f\xdd\xd3\xea\x5e\xcc\x63\x55\x3e\x11\x4f\x51\x32\xe7\xaf\x54\xcb\xbd\x05\xd4\xde\xb2\x77\xcd\xed\x7c\x17\xbb\xb2\xdb\x5d\xec\xf5\xd5\xf5\x7e\xb8\xe4\x36\x05\x7c\xd6\x5e\xe9\x89\x8b\x1d\x96\xc2\xa1\xd2\x65\x12\x97\x30\x00\x4d\x2a\x03\x6a\x8a\xa3\xb2\x72\xca\xe2\xb9\xb7\x51\x0a\xd5\xf7\x5b\x9b\x25\x32\xa0\xcf\x6c\x96\xf2\x0f\x1f\xab\xc4\x94\x1b\x47\x99\xf3\x00\x14\x39\xb1\xd8\x1a\x05\xcc\x7f\x7a\x02\x2e\xef\x6c\x3b\xd3\x5e\x18\xb0\x05\x8e\xba\x14\xda\x60\x33\xe3\xba\x7f\xd6\xbe\xcc\x1b\x39\xee\x1a\xa6\x1c\xff\xa5\x02\x6c\xf4\xad\x68\xbc\x05\x06\x7c\x39\x7c\x7a\xbc\xe9\x3c\x50\x8a\xa7\x8f\x89\xf1\x72\xf8\x8b\x1f\xc4\xf9\x90\xcf\x69\xa3\x00\xfe\x9c\x35\x20\xb7\xa8\x14\xe3\x7f\x55\xe6\x7c\xdc\x9f\x93\x36\x3e\xae\xfc\xf1\x45\xff\xd1\x96\x18\x69\x76\xf4\xee\x52\xf0\xed\xed\xeb\xfa\xfd\x7f\xbc\xc7\xfd\x9e\xf8\xa1\xb5\xee\xdb\xe6\xae\xb6\xce\x23\xcd\xe4\xcc\x80\xa7\xae\x17\x2a\x5a\x9f\x68\x48\x72\x25\x4e\x64\xc3\xef\x7c\x4e\x78\x83\xae\xa8\x5d\x09\xcf\x95\x86\xdc\xe0\x89\x28\x62\x8e\xd4\x17\x85\xa7\x6c\xa8\xf2\x8c\xdc\xa6\x1c\xc5\x09\x69\x58\x9a\xb9\x9c\x0a\xb7\x82\xd2\x65\x82\x2e\xad\xe5\x76\x46\xbf\xf1\xb1\x2c\xe6\xd4\xdd\xe8\xe5\x1f\xad\x63\xbc\x52\xb3\x3f\x07\x3c\x89\xae\xd8\xf0\x2b\x00\x00\xff\xff\x9e\xca\xa1\xb4\x4d\x02\x00\x00") func mhcremediationalertYamlBytes() ([]byte, error) { return bindataRead( diff --git a/pkg/operator/controllers/machinehealthcheck/staticresources/mhcremediationalert.yaml b/pkg/operator/controllers/machinehealthcheck/staticresources/mhcremediationalert.yaml index 0987a37b67f..1995448f974 100644 --- a/pkg/operator/controllers/machinehealthcheck/staticresources/mhcremediationalert.yaml +++ b/pkg/operator/controllers/machinehealthcheck/staticresources/mhcremediationalert.yaml @@ -13,6 +13,6 @@ spec: - alert: SREMachineHealthCheckRemediationRateHigh expr: increase(mapi_machinehealthcheck_remediation_success_total [60m]) > 1 Annotations: - Message: worker nodes have been remediated 2 or more times in the last hour this may indicate an unstable workload running on the cluster + Message: worker nodes have been remediated 2 or more times in the last hour this may indicate an unstable workload running on the cluster labels: severity: warning diff --git a/pkg/operator/controllers/muo/muo_controller_test.go b/pkg/operator/controllers/muo/muo_controller_test.go index 1ce58260864..fd43ecb9636 100644 --- a/pkg/operator/controllers/muo/muo_controller_test.go +++ b/pkg/operator/controllers/muo/muo_controller_test.go @@ -171,13 +171,13 @@ func TestMUOReconciler(t *testing.T) { controllerPullSpec: "wonderfulPullspec", }, pullsecret: "{\"auths\": {\"" + pullSecretOCMKey + "\": {\"auth\": \"secret value\"}}}", - mocks: func(md *mock_muo.MockDeployer, cluster *arov1alpha1.Cluster) { + mocks: func(md *mock_deployer.MockDeployer, cluster *arov1alpha1.Cluster) { expectedConfig := &config.MUODeploymentConfig{ Pullspec: "wonderfulPullspec", EnableConnected: false, } md.EXPECT().CreateOrUpdate(gomock.Any(), cluster, expectedConfig).Return(nil) - md.EXPECT().IsReady(gomock.Any()).Return(true, nil) + md.EXPECT().IsReady(gomock.Any(), gomock.Any(), gomock.Any()).Return(true, nil) }, }, {