mirror of
https://github.com/1Password/onepassword-operator.git
synced 2025-10-23 07:58:04 +00:00
Upgrade the operator to use Operator SDK v1.33.0 (#182)
* Move controller package inside internal directory Based on the go/v4 project structure, the following changed: - Pakcage `controllers` is now named `controller` - Package `controller` now lives inside new `internal` directory * Move main.go in cmd directory Based on the new go/v4 project structure, `main.go` now lives in the `cmd` directory. * Change package import in main.go * Update go mod dependencies Update the dependencies based on the versions obtained by creating a new operator project using `kubebuilder init --domain onepassword.com --plugins=go/v4`. This is based on the migration steps provided to go from go/v3 to go/v4 (https://book.kubebuilder.io/migration/migration_guide_gov3_to_gov4) * Update vendor * Adjust code for breaking changes from pkg update sigs.k8s.io/controller-runtime package had breaking changes from v0.14.5 to v0.16.3. This commit brings the changes needed to achieve the same things using the new functionality avaialble. * Adjust paths to connect yaml files Since `main.go` is now in `cmd` directory, the paths to the files for deploying Connect have to be adjusted based on the new location `main.go` is executed from. * Update files based on new structure and scaffolding These changes are made based on the new project structure and scaffolding obtained when using the new go/v4 project structure. These were done based on the migration steps mentioned when migrating to go/v4 (https://book.kubebuilder.io/migration/migration_guide_gov3_to_gov4). * Update config files These updates are made based on the Kustomize v4 syntax. This is part of the upgrate to go/v4 (https://book.kubebuilder.io/migration/migration_guide_gov3_to_gov4) * Update dependencies and GO version * Update vendor * Update Kubernetes tools versions * Update operator version in Makefile Now the version in the Makefile matches the version of the operator * Update Operator SDK version in version.go * Adjust generated deepcopy It seems that the +build tag is no longer needed based on the latest generated scaffolding, therefore it's removed. * Update copyright year * Bring back missing changes from migration Some customization in Makefile was lost during the migration process. Specifically, the namespace customization for `make deploy` command. Also, we push changes to kustomization.yaml for making the deploy process smoother. * Add RBAC perms for coordination.k8s.io It seems that with the latest changes to Kubernetes and Kustomize, we need to add additional RBAC to the service account used so that it can properly access the `leases` resource. * Optimize Dockerfile Dockerfile had a step for caching dependencies (go mod download). However, this is already done by the vendor directory, which we include. Therefore, this step can be removed to make the image build time faster.
This commit is contained in:
59
vendor/github.com/onsi/gomega/matchers.go
generated
vendored
59
vendor/github.com/onsi/gomega/matchers.go
generated
vendored
@@ -1,6 +1,7 @@
|
||||
package gomega
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
@@ -52,15 +53,31 @@ func BeNil() types.GomegaMatcher {
|
||||
}
|
||||
|
||||
// BeTrue succeeds if actual is true
|
||||
//
|
||||
// In general, it's better to use `BeTrueBecause(reason)` to provide a more useful error message if a true check fails.
|
||||
func BeTrue() types.GomegaMatcher {
|
||||
return &matchers.BeTrueMatcher{}
|
||||
}
|
||||
|
||||
// BeFalse succeeds if actual is false
|
||||
//
|
||||
// In general, it's better to use `BeFalseBecause(reason)` to provide a more useful error message if a false check fails.
|
||||
func BeFalse() types.GomegaMatcher {
|
||||
return &matchers.BeFalseMatcher{}
|
||||
}
|
||||
|
||||
// BeTrueBecause succeeds if actual is true and displays the provided reason if it is false
|
||||
// fmt.Sprintf is used to render the reason
|
||||
func BeTrueBecause(format string, args ...any) types.GomegaMatcher {
|
||||
return &matchers.BeTrueMatcher{Reason: fmt.Sprintf(format, args...)}
|
||||
}
|
||||
|
||||
// BeFalseBecause succeeds if actual is false and displays the provided reason if it is true.
|
||||
// fmt.Sprintf is used to render the reason
|
||||
func BeFalseBecause(format string, args ...any) types.GomegaMatcher {
|
||||
return &matchers.BeFalseMatcher{Reason: fmt.Sprintf(format, args...)}
|
||||
}
|
||||
|
||||
// HaveOccurred succeeds if actual is a non-nil error
|
||||
// The typical Go error checking pattern looks like:
|
||||
//
|
||||
@@ -87,17 +104,45 @@ func Succeed() types.GomegaMatcher {
|
||||
return &matchers.SucceedMatcher{}
|
||||
}
|
||||
|
||||
// MatchError succeeds if actual is a non-nil error that matches the passed in string/error.
|
||||
// MatchError succeeds if actual is a non-nil error that matches the passed in
|
||||
// string, error, function, or matcher.
|
||||
//
|
||||
// These are valid use-cases:
|
||||
//
|
||||
// Expect(err).Should(MatchError("an error")) //asserts that err.Error() == "an error"
|
||||
// Expect(err).Should(MatchError(SomeError)) //asserts that err == SomeError (via reflect.DeepEqual)
|
||||
// When passed a string:
|
||||
//
|
||||
// It is an error for err to be nil or an object that does not implement the Error interface
|
||||
func MatchError(expected interface{}) types.GomegaMatcher {
|
||||
// Expect(err).To(MatchError("an error"))
|
||||
//
|
||||
// asserts that err.Error() == "an error"
|
||||
//
|
||||
// When passed an error:
|
||||
//
|
||||
// Expect(err).To(MatchError(SomeError))
|
||||
//
|
||||
// First checks if errors.Is(err, SomeError).
|
||||
// If that fails then it checks if reflect.DeepEqual(err, SomeError) repeatedly for err and any errors wrapped by err
|
||||
//
|
||||
// When passed a matcher:
|
||||
//
|
||||
// Expect(err).To(MatchError(ContainSubstring("sprocket not found")))
|
||||
//
|
||||
// the matcher is passed err.Error(). In this case it asserts that err.Error() contains substring "sprocket not found"
|
||||
//
|
||||
// When passed a func(err) bool and a description:
|
||||
//
|
||||
// Expect(err).To(MatchError(os.IsNotExist, "IsNotExist"))
|
||||
//
|
||||
// the function is passed err and matches if the return value is true. The description is required to allow Gomega
|
||||
// to print a useful error message.
|
||||
//
|
||||
// It is an error for err to be nil or an object that does not implement the
|
||||
// Error interface
|
||||
//
|
||||
// The optional second argument is a description of the error function, if used. This is required when passing a function but is ignored in all other cases.
|
||||
func MatchError(expected interface{}, functionErrorDescription ...any) types.GomegaMatcher {
|
||||
return &matchers.MatchErrorMatcher{
|
||||
Expected: expected,
|
||||
Expected: expected,
|
||||
FuncErrDescription: functionErrorDescription,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -378,7 +423,7 @@ func ContainElements(elements ...interface{}) types.GomegaMatcher {
|
||||
}
|
||||
|
||||
// HaveEach succeeds if actual solely contains elements that match the passed in element.
|
||||
// Please note that if actual is empty, HaveEach always will succeed.
|
||||
// Please note that if actual is empty, HaveEach always will fail.
|
||||
// By default HaveEach() uses Equal() to perform the match, however a
|
||||
// matcher can be passed in instead:
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user