Skip to content
This repository has been archived by the owner on Nov 28, 2024. It is now read-only.

Update openstack-k8s-operators to 78c3082 #363

Merged
merged 1 commit into from
May 23, 2024
Merged

Update openstack-k8s-operators to 78c3082 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
github.com/go-playground/validator/v10 v10.19.0
github.com/onsi/ginkgo/v2 v2.18.0
github.com/onsi/gomega v1.33.1
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
Expand Down
8 changes: 4 additions & 4 deletions api/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ github.com/onsi/ginkgo/v2 v2.18.0 h1:W9Y7IWXxPUpAit9ieMOLI7PJZGaW22DTKgiVAuhDTLc
github.com/onsi/ginkgo/v2 v2.18.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
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=
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/conditions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ const (
AnsibleExecutionJobWaitingMessage = "AnsibleExecutionJob is running"

// AnsibleExecutionJobErrorMessage
AnsibleExecutionJobErrorMessage = "AnsibleExecutionJob error occured %s"
AnsibleExecutionJobErrorMessage = "AnsibleExecutionJob error occurred %s"
)
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ require (
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
github.com/onsi/ginkgo/v2 v2.18.0
github.com/onsi/gomega v1.33.1
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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
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=
Expand Down
8 changes: 4 additions & 4 deletions tests/functional/ansibleee_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions tests/kuttl/tests/run_failed_playbook/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading