mirror of
https://github.com/1Password/onepassword-operator.git
synced 2025-10-24 16:30:47 +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:
1
vendor/k8s.io/apimachinery/pkg/runtime/codec.go
generated
vendored
1
vendor/k8s.io/apimachinery/pkg/runtime/codec.go
generated
vendored
@@ -45,7 +45,6 @@ func NewCodec(e Encoder, d Decoder) Codec {
|
||||
|
||||
// Encode is a convenience wrapper for encoding to a []byte from an Encoder
|
||||
func Encode(e Encoder, obj Object) ([]byte, error) {
|
||||
// TODO: reuse buffer
|
||||
buf := &bytes.Buffer{}
|
||||
if err := e.Encode(obj, buf); err != nil {
|
||||
return nil, err
|
||||
|
||||
4
vendor/k8s.io/apimachinery/pkg/runtime/converter.go
generated
vendored
4
vendor/k8s.io/apimachinery/pkg/runtime/converter.go
generated
vendored
@@ -231,7 +231,7 @@ func (c *fromUnstructuredContext) pushKey(key string) {
|
||||
|
||||
}
|
||||
|
||||
// FromUnstructuredWIthValidation converts an object from map[string]interface{} representation into a concrete type.
|
||||
// FromUnstructuredWithValidation converts an object from map[string]interface{} representation into a concrete type.
|
||||
// It uses encoding/json/Unmarshaler if object implements it or reflection if not.
|
||||
// It takes a validationDirective that indicates how to behave when it encounters unknown fields.
|
||||
func (c *unstructuredConverter) FromUnstructuredWithValidation(u map[string]interface{}, obj interface{}, returnUnknownFields bool) error {
|
||||
@@ -465,7 +465,7 @@ func sliceFromUnstructured(sv, dv reflect.Value, ctx *fromUnstructuredContext) e
|
||||
}
|
||||
dv.SetBytes(data)
|
||||
} else {
|
||||
dv.Set(reflect.Zero(dt))
|
||||
dv.Set(reflect.MakeSlice(dt, 0, 0))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
23
vendor/k8s.io/apimachinery/pkg/runtime/helper.go
generated
vendored
23
vendor/k8s.io/apimachinery/pkg/runtime/helper.go
generated
vendored
@@ -257,3 +257,26 @@ func (d WithoutVersionDecoder) Decode(data []byte, defaults *schema.GroupVersion
|
||||
}
|
||||
return obj, gvk, err
|
||||
}
|
||||
|
||||
type encoderWithAllocator struct {
|
||||
encoder EncoderWithAllocator
|
||||
memAllocator MemoryAllocator
|
||||
}
|
||||
|
||||
// NewEncoderWithAllocator returns a new encoder
|
||||
func NewEncoderWithAllocator(e EncoderWithAllocator, a MemoryAllocator) Encoder {
|
||||
return &encoderWithAllocator{
|
||||
encoder: e,
|
||||
memAllocator: a,
|
||||
}
|
||||
}
|
||||
|
||||
// Encode writes the provided object to the nested writer
|
||||
func (e *encoderWithAllocator) Encode(obj Object, w io.Writer) error {
|
||||
return e.encoder.EncodeWithAllocator(obj, w, e.memAllocator)
|
||||
}
|
||||
|
||||
// Identifier returns identifier of this encoder.
|
||||
func (e *encoderWithAllocator) Identifier() Identifier {
|
||||
return e.encoder.Identifier()
|
||||
}
|
||||
|
||||
5
vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go
generated
vendored
5
vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go
generated
vendored
@@ -365,4 +365,9 @@ type Unstructured interface {
|
||||
// error should terminate the iteration. If IsList() returns false, this method should return an error
|
||||
// instead of calling the provided function.
|
||||
EachListItem(func(Object) error) error
|
||||
// EachListItemWithAlloc works like EachListItem, but avoids retaining references to a slice of items.
|
||||
// It does this by making a shallow copy of non-pointer items before passing them to fn.
|
||||
//
|
||||
// If the items passed to fn are not retained, or are retained for the same duration, use EachListItem instead for memory efficiency.
|
||||
EachListItemWithAlloc(func(Object) error) error
|
||||
}
|
||||
|
||||
8
vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go
generated
vendored
8
vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go
generated
vendored
@@ -39,7 +39,7 @@ func ParseResourceArg(arg string) (*GroupVersionResource, GroupResource) {
|
||||
// ParseKindArg takes the common style of string which may be either `Kind.group.com` or `Kind.version.group.com`
|
||||
// and parses it out into both possibilities. This code takes no responsibility for knowing which representation was intended
|
||||
// but with a knowledge of all GroupKinds, calling code can take a very good guess. If there are only two segments, then
|
||||
// `*GroupVersionResource` is nil.
|
||||
// `*GroupVersionKind` is nil.
|
||||
// `Kind.group.com` -> `group=com, version=group, kind=Kind` and `group=group.com, kind=Kind`
|
||||
func ParseKindArg(arg string) (*GroupVersionKind, GroupKind) {
|
||||
var gvk *GroupVersionKind
|
||||
@@ -191,8 +191,7 @@ func (gv GroupVersion) Identifier() string {
|
||||
// if none of the options match the group. It prefers a match to group and version over just group.
|
||||
// TODO: Move GroupVersion to a package under pkg/runtime, since it's used by scheme.
|
||||
// TODO: Introduce an adapter type between GroupVersion and runtime.GroupVersioner, and use LegacyCodec(GroupVersion)
|
||||
//
|
||||
// in fewer places.
|
||||
// in fewer places.
|
||||
func (gv GroupVersion) KindForGroupVersionKinds(kinds []GroupVersionKind) (target GroupVersionKind, ok bool) {
|
||||
for _, gvk := range kinds {
|
||||
if gvk.Group == gv.Group && gvk.Version == gv.Version {
|
||||
@@ -240,8 +239,7 @@ func (gv GroupVersion) WithResource(resource string) GroupVersionResource {
|
||||
// GroupVersions can be used to represent a set of desired group versions.
|
||||
// TODO: Move GroupVersions to a package under pkg/runtime, since it's used by scheme.
|
||||
// TODO: Introduce an adapter type between GroupVersions and runtime.GroupVersioner, and use LegacyCodec(GroupVersion)
|
||||
//
|
||||
// in fewer places.
|
||||
// in fewer places.
|
||||
type GroupVersions []GroupVersion
|
||||
|
||||
// Identifier implements runtime.GroupVersioner interface.
|
||||
|
||||
3
vendor/k8s.io/apimachinery/pkg/runtime/scheme.go
generated
vendored
3
vendor/k8s.io/apimachinery/pkg/runtime/scheme.go
generated
vendored
@@ -118,8 +118,7 @@ func (s *Scheme) Converter() *conversion.Converter {
|
||||
// API group and version that would never be updated.
|
||||
//
|
||||
// TODO: there is discussion about removing unversioned and replacing it with objects that are manifest into
|
||||
//
|
||||
// every version with particular schemas. Resolve this method at that point.
|
||||
// every version with particular schemas. Resolve this method at that point.
|
||||
func (s *Scheme) AddUnversionedTypes(version schema.GroupVersion, types ...Object) {
|
||||
s.addObservedVersion(version)
|
||||
s.AddKnownTypes(version, types...)
|
||||
|
||||
3
vendor/k8s.io/apimachinery/pkg/runtime/serializer/codec_factory.go
generated
vendored
3
vendor/k8s.io/apimachinery/pkg/runtime/serializer/codec_factory.go
generated
vendored
@@ -259,8 +259,7 @@ func (f CodecFactory) SupportedMediaTypes() []runtime.SerializerInfo {
|
||||
// invoke CodecForVersions. Callers that need only to read data should use UniversalDecoder().
|
||||
//
|
||||
// TODO: make this call exist only in pkg/api, and initialize it with the set of default versions.
|
||||
//
|
||||
// All other callers will be forced to request a Codec directly.
|
||||
// All other callers will be forced to request a Codec directly.
|
||||
func (f CodecFactory) LegacyCodec(version ...schema.GroupVersion) runtime.Codec {
|
||||
return versioning.NewDefaultingCodecForScheme(f.scheme, f.legacySerializer, f.universal, schema.GroupVersions(version), runtime.InternalGroupVersioner)
|
||||
}
|
||||
|
||||
20
vendor/k8s.io/apimachinery/pkg/runtime/serializer/streaming/streaming.go
generated
vendored
20
vendor/k8s.io/apimachinery/pkg/runtime/serializer/streaming/streaming.go
generated
vendored
@@ -134,23 +134,3 @@ func (e *encoder) Encode(obj runtime.Object) error {
|
||||
e.buf.Reset()
|
||||
return err
|
||||
}
|
||||
|
||||
type encoderWithAllocator struct {
|
||||
writer io.Writer
|
||||
encoder runtime.EncoderWithAllocator
|
||||
memAllocator runtime.MemoryAllocator
|
||||
}
|
||||
|
||||
// NewEncoderWithAllocator returns a new streaming encoder
|
||||
func NewEncoderWithAllocator(w io.Writer, e runtime.EncoderWithAllocator, a runtime.MemoryAllocator) Encoder {
|
||||
return &encoderWithAllocator{
|
||||
writer: w,
|
||||
encoder: e,
|
||||
memAllocator: a,
|
||||
}
|
||||
}
|
||||
|
||||
// Encode writes the provided object to the nested writer
|
||||
func (e *encoderWithAllocator) Encode(obj runtime.Object) error {
|
||||
return e.encoder.EncodeWithAllocator(obj, e.writer, e.memAllocator)
|
||||
}
|
||||
|
||||
2
vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go
generated
vendored
2
vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go
generated
vendored
@@ -147,7 +147,7 @@ func (c *codec) Decode(data []byte, defaultGVK *schema.GroupVersionKind, into ru
|
||||
}
|
||||
|
||||
if d, ok := obj.(runtime.NestedObjectDecoder); ok {
|
||||
if err := d.DecodeNestedObjects(runtime.WithoutVersionDecoder{c.decoder}); err != nil {
|
||||
if err := d.DecodeNestedObjects(runtime.WithoutVersionDecoder{Decoder: c.decoder}); err != nil {
|
||||
if strictErr, ok := runtime.AsStrictDecodingError(err); ok {
|
||||
// save the strictDecodingError let and the caller decide what to do with it
|
||||
strictDecodingErrs = append(strictDecodingErrs, strictErr.Errors()...)
|
||||
|
||||
76
vendor/k8s.io/apimachinery/pkg/runtime/splice.go
generated
vendored
Normal file
76
vendor/k8s.io/apimachinery/pkg/runtime/splice.go
generated
vendored
Normal file
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
Copyright 2023 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package runtime
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
)
|
||||
|
||||
// Splice is the interface that wraps the Splice method.
|
||||
//
|
||||
// Splice moves data from given slice without copying the underlying data for
|
||||
// efficiency purpose. Therefore, the caller should make sure the underlying
|
||||
// data is not changed later.
|
||||
type Splice interface {
|
||||
Splice([]byte)
|
||||
io.Writer
|
||||
Reset()
|
||||
Bytes() []byte
|
||||
}
|
||||
|
||||
// A spliceBuffer implements Splice and io.Writer interfaces.
|
||||
type spliceBuffer struct {
|
||||
raw []byte
|
||||
buf *bytes.Buffer
|
||||
}
|
||||
|
||||
func NewSpliceBuffer() Splice {
|
||||
return &spliceBuffer{}
|
||||
}
|
||||
|
||||
// Splice implements the Splice interface.
|
||||
func (sb *spliceBuffer) Splice(raw []byte) {
|
||||
sb.raw = raw
|
||||
}
|
||||
|
||||
// Write implements the io.Writer interface.
|
||||
func (sb *spliceBuffer) Write(p []byte) (n int, err error) {
|
||||
if sb.buf == nil {
|
||||
sb.buf = &bytes.Buffer{}
|
||||
}
|
||||
return sb.buf.Write(p)
|
||||
}
|
||||
|
||||
// Reset resets the buffer to be empty.
|
||||
func (sb *spliceBuffer) Reset() {
|
||||
if sb.buf != nil {
|
||||
sb.buf.Reset()
|
||||
}
|
||||
sb.raw = nil
|
||||
}
|
||||
|
||||
// Bytes returns the data held by the buffer.
|
||||
func (sb *spliceBuffer) Bytes() []byte {
|
||||
if sb.buf != nil && len(sb.buf.Bytes()) > 0 {
|
||||
return sb.buf.Bytes()
|
||||
}
|
||||
if sb.raw != nil {
|
||||
return sb.raw
|
||||
}
|
||||
return []byte{}
|
||||
}
|
||||
2
vendor/k8s.io/apimachinery/pkg/runtime/types.go
generated
vendored
2
vendor/k8s.io/apimachinery/pkg/runtime/types.go
generated
vendored
@@ -123,7 +123,7 @@ type Unknown struct {
|
||||
// Raw will hold the complete serialized object which couldn't be matched
|
||||
// with a registered type. Most likely, nothing should be done with this
|
||||
// except for passing it through the system.
|
||||
Raw []byte `protobuf:"bytes,2,opt,name=raw"`
|
||||
Raw []byte `json:"-" protobuf:"bytes,2,opt,name=raw"`
|
||||
// ContentEncoding is encoding used to encode 'Raw' data.
|
||||
// Unspecified means no encoding.
|
||||
ContentEncoding string `protobuf:"bytes,3,opt,name=contentEncoding"`
|
||||
|
||||
Reference in New Issue
Block a user