From dbef8a2c055d31b52f4de7c98688003372ff59d7 Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Thu, 23 May 2024 13:08:43 +0100 Subject: [PATCH] Update openstack-k8s-operators to 78c3082 Signed-off-by: Fabricio Aguiar --- api/go.mod | 4 ++-- api/go.sum | 8 ++++---- api/v1beta1/conditions.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- tests/functional/ansibleee_controller_test.go | 8 ++++---- tests/kuttl/tests/run_failed_playbook/01-assert.yaml | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/go.mod b/api/go.mod index b25c8648..a72db275 100644 --- a/api/go.mod +++ b/api/go.mod @@ -6,8 +6,8 @@ require ( github.com/go-playground/validator/v10 v10.19.0 github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.0 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240523061957-78c308214ae3 + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240523061957-78c308214ae3 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.28.9 k8s.io/apimachinery v0.28.9 diff --git a/api/go.sum b/api/go.sum index 1adddc3d..edb12b49 100644 --- a/api/go.sum +++ b/api/go.sum @@ -90,10 +90,10 @@ github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 h1:WLsG3Ko+phW5xZJjncypLWGASoLqKrt05qN9Zxsad6g= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:lYhFzul37AR/6gAhTAA1KKWbOlzB3F/7014lejn883c= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6 h1:NNSOEpTZCa9RL5sZiF4ZOlB+agBrL7q7FB9pC58d4S8= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:C/qUWW4lW3687riZxYd+YRCtOyHZKURu3Imv6S9OP7U= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240523061957-78c308214ae3 h1:0vrMw/RB4y8skUl/4u1h3mRNZ1iUXeh4ZcUjSQqnU8o= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240523061957-78c308214ae3/go.mod h1:lYhFzul37AR/6gAhTAA1KKWbOlzB3F/7014lejn883c= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240523061957-78c308214ae3 h1:fTARw85wf7KxGMKgb07rFbLGSNFbYpOqY/YLJEIDM38= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240523061957-78c308214ae3/go.mod h1:C/qUWW4lW3687riZxYd+YRCtOyHZKURu3Imv6S9OP7U= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/api/v1beta1/conditions.go b/api/v1beta1/conditions.go index 7b7bcd90..e3ac23fd 100644 --- a/api/v1beta1/conditions.go +++ b/api/v1beta1/conditions.go @@ -43,5 +43,5 @@ const ( AnsibleExecutionJobWaitingMessage = "AnsibleExecutionJob is running" // AnsibleExecutionJobErrorMessage - AnsibleExecutionJobErrorMessage = "AnsibleExecutionJob error occured %s" + AnsibleExecutionJobErrorMessage = "AnsibleExecutionJob error occurred %s" ) diff --git a/go.mod b/go.mod index c76df275..f97e5826 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.0 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 - github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240523061957-78c308214ae3 + github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240523061957-78c308214ae3 github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-00010101000000-000000000000 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.28.9 diff --git a/go.sum b/go.sum index 07033173..3158c7e3 100644 --- a/go.sum +++ b/go.sum @@ -94,10 +94,10 @@ github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6 h1:WLsG3Ko+phW5xZJjncypLWGASoLqKrt05qN9Zxsad6g= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:lYhFzul37AR/6gAhTAA1KKWbOlzB3F/7014lejn883c= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6 h1:NNSOEpTZCa9RL5sZiF4ZOlB+agBrL7q7FB9pC58d4S8= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:C/qUWW4lW3687riZxYd+YRCtOyHZKURu3Imv6S9OP7U= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240523061957-78c308214ae3 h1:0vrMw/RB4y8skUl/4u1h3mRNZ1iUXeh4ZcUjSQqnU8o= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240523061957-78c308214ae3/go.mod h1:lYhFzul37AR/6gAhTAA1KKWbOlzB3F/7014lejn883c= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240523061957-78c308214ae3 h1:fTARw85wf7KxGMKgb07rFbLGSNFbYpOqY/YLJEIDM38= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240523061957-78c308214ae3/go.mod h1:C/qUWW4lW3687riZxYd+YRCtOyHZKURu3Imv6S9OP7U= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/tests/functional/ansibleee_controller_test.go b/tests/functional/ansibleee_controller_test.go index 007d2485..6cb72e40 100644 --- a/tests/functional/ansibleee_controller_test.go +++ b/tests/functional/ansibleee_controller_test.go @@ -105,7 +105,7 @@ var _ = Describe("Ansibleee controller", func() { v1beta1.AnsibleExecutionJobReadyCondition, corev1.ConditionFalse, condition.ErrorReason, - "AnsibleExecutionJob error occured Internal error occurred: Job Failed. Check job logs", + "AnsibleExecutionJob error occurred Internal error occurred: Job Attempt #1 Failed. Check job logs", ) th.ExpectCondition( ansibleeeName, @@ -262,7 +262,7 @@ var _ = Describe("Ansibleee controller", func() { v1beta1.AnsibleExecutionJobReadyCondition, corev1.ConditionFalse, condition.ErrorReason, - "AnsibleExecutionJob error occured Internal error occurred: Job Failed. Check job logs", + "AnsibleExecutionJob error occurred Internal error occurred: Job Attempt #1 Failed. Check job logs", ) th.ExpectCondition( ansibleeeName, @@ -393,7 +393,7 @@ var _ = Describe("Ansibleee controller", func() { v1beta1.AnsibleExecutionJobReadyCondition, corev1.ConditionFalse, condition.ErrorReason, - "AnsibleExecutionJob error occured Internal error occurred: Job Failed. Check job logs", + "AnsibleExecutionJob error occurred Internal error occurred: Job Attempt #1 Failed. Check job logs", ) th.ExpectCondition( ansibleeeName, @@ -541,7 +541,7 @@ var _ = Describe("Ansibleee controller", func() { v1beta1.AnsibleExecutionJobReadyCondition, corev1.ConditionFalse, condition.ErrorReason, - "AnsibleExecutionJob error occured Internal error occurred: Job Failed. Check job logs", + "AnsibleExecutionJob error occurred Internal error occurred: Job Attempt #1 Failed. Check job logs", ) th.ExpectCondition( ansibleeeName, diff --git a/tests/kuttl/tests/run_failed_playbook/01-assert.yaml b/tests/kuttl/tests/run_failed_playbook/01-assert.yaml index 2d2ba129..8ea17827 100644 --- a/tests/kuttl/tests/run_failed_playbook/01-assert.yaml +++ b/tests/kuttl/tests/run_failed_playbook/01-assert.yaml @@ -24,13 +24,13 @@ spec: status: JobStatus: Failed conditions: - - message: 'AnsibleExecutionJob error occured Internal error occurred: Job Failed. + - message: 'AnsibleExecutionJob error occurred Internal error occurred: Job has reached the specified backoff limit. Check job logs' reason: Error severity: Warning status: "False" type: Ready - - message: 'AnsibleExecutionJob error occured Internal error occurred: Job Failed. + - message: 'AnsibleExecutionJob error occurred Internal error occurred: Job has reached the specified backoff limit. Check job logs' reason: Error severity: Warning @@ -112,4 +112,4 @@ status: reason: BackoffLimitExceeded status: "True" type: Failed - failed: 4 + failed: 4 \ No newline at end of file