Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Bump operatorpkg #1701

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: Bump operatorpkg #1701

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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.0
require (
github.com/Pallinder/go-randomdata v1.2.0
github.com/avast/retry-go v3.0.0+incompatible
github.com/awslabs/operatorpkg v0.0.0-20240912183034-ab1e7d730cf3
github.com/awslabs/operatorpkg v0.0.0-20240920182301-771460b3160b
github.com/docker/docker v27.2.1+incompatible
github.com/go-logr/logr v1.4.2
github.com/imdario/mergo v0.3.16
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00
github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y=
github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
github.com/awslabs/operatorpkg v0.0.0-20240912183034-ab1e7d730cf3 h1:jhFYTRgOZhFMtQ2GzY2dVDAjorHpWI0rt9wDFG5jQ2o=
github.com/awslabs/operatorpkg v0.0.0-20240912183034-ab1e7d730cf3/go.mod h1:WnRtbjt0U71m4PqDBLybOcY5KkbeGh9FIsJGohVFUo4=
github.com/awslabs/operatorpkg v0.0.0-20240920182301-771460b3160b h1:aG1+YRmKIf5nLTZJNhw1NmuxvjUprWYyluqJ2jmVqiU=
github.com/awslabs/operatorpkg v0.0.0-20240920182301-771460b3160b/go.mod h1:RI+iNDn57c3WX0tsZg4rvkmM58lWsEC5cc6E4vJJld8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
Expand Down
6 changes: 0 additions & 6 deletions pkg/controllers/nodepool/readiness/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ var _ = Describe("Readiness", func() {
nodePool = ExpectExists(ctx, env.Client, nodePool)
Expect(nodePool.StatusConditions().Get(status.ConditionReady).IsFalse()).To(BeTrue())
})
It("should have status condition on nodePool as ready if nodeClass is ready", func() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since operatorpkg has now changes for observed generation, nodePool status condition will not go ready unless the dependents are also set to true within the reconciliation lopp.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO: We shouldn't drop this test just because of this. Can we set the dependents for our other sub-conditions to true so that this test passes?

ExpectApplied(ctx, env.Client, nodePool, nodeClass)
_ = ExpectObjectReconciled(ctx, env.Client, controller, nodePool)
nodePool = ExpectExists(ctx, env.Client, nodePool)
Expect(nodePool.StatusConditions().IsTrue(status.ConditionReady)).To(BeTrue())
})
It("should have status condition on nodePool as not ready if nodeClass is not ready", func() {
nodeClass.Status = v1alpha1.TestNodeClassStatus{
Conditions: []status.Condition{
Expand Down
1 change: 0 additions & 1 deletion pkg/controllers/nodepool/validation/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ var _ = Describe("Counter", func() {
ExpectApplied(ctx, env.Client, nodePool)
ExpectObjectReconciled(ctx, env.Client, nodePoolValidationController, nodePool)
nodePool = ExpectExists(ctx, env.Client, nodePool)
Expect(nodePool.StatusConditions().IsTrue(status.ConditionReady)).To(BeTrue())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we drop this? Can we hold the same testing line and just make changes to ensure that we can keep this around?

Expect(nodePool.StatusConditions().IsTrue(v1.ConditionTypeValidationSucceeded)).To(BeTrue())
})
It("should set the NodePoolValidationSucceeded status condition to false if nodePool validation failed", func() {
Expand Down
Loading