mirror of
https://github.com/1Password/onepassword-operator.git
synced 2025-10-22 23:48:05 +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:
Eduard Filip
6
vendor/k8s.io/api/coordination/v1/generated.proto
generated
vendored
6
vendor/k8s.io/api/coordination/v1/generated.proto
generated
vendored
@@ -34,7 +34,7 @@ message Lease {
|
||||
// +optional
|
||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
||||
|
||||
// Specification of the Lease.
|
||||
// spec contains the specification of the Lease.
|
||||
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
|
||||
// +optional
|
||||
optional LeaseSpec spec = 2;
|
||||
@@ -47,7 +47,7 @@ message LeaseList {
|
||||
// +optional
|
||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
|
||||
|
||||
// Items is a list of schema objects.
|
||||
// items is a list of schema objects.
|
||||
repeated Lease items = 2;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ message LeaseSpec {
|
||||
|
||||
// leaseDurationSeconds is a duration that candidates for a lease need
|
||||
// to wait to force acquire it. This is measure against time of last
|
||||
// observed RenewTime.
|
||||
// observed renewTime.
|
||||
// +optional
|
||||
optional int32 leaseDurationSeconds = 2;
|
||||
|
||||
|
||||
6
vendor/k8s.io/api/coordination/v1/types.go
generated
vendored
6
vendor/k8s.io/api/coordination/v1/types.go
generated
vendored
@@ -30,7 +30,7 @@ type Lease struct {
|
||||
// +optional
|
||||
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
||||
|
||||
// Specification of the Lease.
|
||||
// spec contains the specification of the Lease.
|
||||
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
|
||||
// +optional
|
||||
Spec LeaseSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
|
||||
@@ -43,7 +43,7 @@ type LeaseSpec struct {
|
||||
HolderIdentity *string `json:"holderIdentity,omitempty" protobuf:"bytes,1,opt,name=holderIdentity"`
|
||||
// leaseDurationSeconds is a duration that candidates for a lease need
|
||||
// to wait to force acquire it. This is measure against time of last
|
||||
// observed RenewTime.
|
||||
// observed renewTime.
|
||||
// +optional
|
||||
LeaseDurationSeconds *int32 `json:"leaseDurationSeconds,omitempty" protobuf:"varint,2,opt,name=leaseDurationSeconds"`
|
||||
// acquireTime is a time when the current lease was acquired.
|
||||
@@ -69,6 +69,6 @@ type LeaseList struct {
|
||||
// +optional
|
||||
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
||||
|
||||
// Items is a list of schema objects.
|
||||
// items is a list of schema objects.
|
||||
Items []Lease `json:"items" protobuf:"bytes,2,rep,name=items"`
|
||||
}
|
||||
|
||||
8
vendor/k8s.io/api/coordination/v1/types_swagger_doc_generated.go
generated
vendored
8
vendor/k8s.io/api/coordination/v1/types_swagger_doc_generated.go
generated
vendored
@@ -24,13 +24,13 @@ package v1
|
||||
// they are on one line! For multiple line or blocks that you want to ignore use ---.
|
||||
// Any context after a --- is ignored.
|
||||
//
|
||||
// Those methods can be generated by using hack/update-generated-swagger-docs.sh
|
||||
// Those methods can be generated by using hack/update-codegen.sh
|
||||
|
||||
// AUTO-GENERATED FUNCTIONS START HERE. DO NOT EDIT.
|
||||
var map_Lease = map[string]string{
|
||||
"": "Lease defines a lease concept.",
|
||||
"metadata": "More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
|
||||
"spec": "Specification of the Lease. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
|
||||
"spec": "spec contains the specification of the Lease. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
|
||||
}
|
||||
|
||||
func (Lease) SwaggerDoc() map[string]string {
|
||||
@@ -40,7 +40,7 @@ func (Lease) SwaggerDoc() map[string]string {
|
||||
var map_LeaseList = map[string]string{
|
||||
"": "LeaseList is a list of Lease objects.",
|
||||
"metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
|
||||
"items": "Items is a list of schema objects.",
|
||||
"items": "items is a list of schema objects.",
|
||||
}
|
||||
|
||||
func (LeaseList) SwaggerDoc() map[string]string {
|
||||
@@ -50,7 +50,7 @@ func (LeaseList) SwaggerDoc() map[string]string {
|
||||
var map_LeaseSpec = map[string]string{
|
||||
"": "LeaseSpec is a specification of a Lease.",
|
||||
"holderIdentity": "holderIdentity contains the identity of the holder of a current lease.",
|
||||
"leaseDurationSeconds": "leaseDurationSeconds is a duration that candidates for a lease need to wait to force acquire it. This is measure against time of last observed RenewTime.",
|
||||
"leaseDurationSeconds": "leaseDurationSeconds is a duration that candidates for a lease need to wait to force acquire it. This is measure against time of last observed renewTime.",
|
||||
"acquireTime": "acquireTime is a time when the current lease was acquired.",
|
||||
"renewTime": "renewTime is a time when the current holder of a lease has last updated the lease.",
|
||||
"leaseTransitions": "leaseTransitions is the number of transitions of a lease between holders.",
|
||||
|
||||
6
vendor/k8s.io/api/coordination/v1beta1/generated.proto
generated
vendored
6
vendor/k8s.io/api/coordination/v1beta1/generated.proto
generated
vendored
@@ -34,7 +34,7 @@ message Lease {
|
||||
// +optional
|
||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
||||
|
||||
// Specification of the Lease.
|
||||
// spec contains the specification of the Lease.
|
||||
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
|
||||
// +optional
|
||||
optional LeaseSpec spec = 2;
|
||||
@@ -47,7 +47,7 @@ message LeaseList {
|
||||
// +optional
|
||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
|
||||
|
||||
// Items is a list of schema objects.
|
||||
// items is a list of schema objects.
|
||||
repeated Lease items = 2;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ message LeaseSpec {
|
||||
|
||||
// leaseDurationSeconds is a duration that candidates for a lease need
|
||||
// to wait to force acquire it. This is measure against time of last
|
||||
// observed RenewTime.
|
||||
// observed renewTime.
|
||||
// +optional
|
||||
optional int32 leaseDurationSeconds = 2;
|
||||
|
||||
|
||||
6
vendor/k8s.io/api/coordination/v1beta1/types.go
generated
vendored
6
vendor/k8s.io/api/coordination/v1beta1/types.go
generated
vendored
@@ -33,7 +33,7 @@ type Lease struct {
|
||||
// +optional
|
||||
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
||||
|
||||
// Specification of the Lease.
|
||||
// spec contains the specification of the Lease.
|
||||
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
|
||||
// +optional
|
||||
Spec LeaseSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
|
||||
@@ -46,7 +46,7 @@ type LeaseSpec struct {
|
||||
HolderIdentity *string `json:"holderIdentity,omitempty" protobuf:"bytes,1,opt,name=holderIdentity"`
|
||||
// leaseDurationSeconds is a duration that candidates for a lease need
|
||||
// to wait to force acquire it. This is measure against time of last
|
||||
// observed RenewTime.
|
||||
// observed renewTime.
|
||||
// +optional
|
||||
LeaseDurationSeconds *int32 `json:"leaseDurationSeconds,omitempty" protobuf:"varint,2,opt,name=leaseDurationSeconds"`
|
||||
// acquireTime is a time when the current lease was acquired.
|
||||
@@ -75,6 +75,6 @@ type LeaseList struct {
|
||||
// +optional
|
||||
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
||||
|
||||
// Items is a list of schema objects.
|
||||
// items is a list of schema objects.
|
||||
Items []Lease `json:"items" protobuf:"bytes,2,rep,name=items"`
|
||||
}
|
||||
|
||||
8
vendor/k8s.io/api/coordination/v1beta1/types_swagger_doc_generated.go
generated
vendored
8
vendor/k8s.io/api/coordination/v1beta1/types_swagger_doc_generated.go
generated
vendored
@@ -24,13 +24,13 @@ package v1beta1
|
||||
// they are on one line! For multiple line or blocks that you want to ignore use ---.
|
||||
// Any context after a --- is ignored.
|
||||
//
|
||||
// Those methods can be generated by using hack/update-generated-swagger-docs.sh
|
||||
// Those methods can be generated by using hack/update-codegen.sh
|
||||
|
||||
// AUTO-GENERATED FUNCTIONS START HERE. DO NOT EDIT.
|
||||
var map_Lease = map[string]string{
|
||||
"": "Lease defines a lease concept.",
|
||||
"metadata": "More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
|
||||
"spec": "Specification of the Lease. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
|
||||
"spec": "spec contains the specification of the Lease. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
|
||||
}
|
||||
|
||||
func (Lease) SwaggerDoc() map[string]string {
|
||||
@@ -40,7 +40,7 @@ func (Lease) SwaggerDoc() map[string]string {
|
||||
var map_LeaseList = map[string]string{
|
||||
"": "LeaseList is a list of Lease objects.",
|
||||
"metadata": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
|
||||
"items": "Items is a list of schema objects.",
|
||||
"items": "items is a list of schema objects.",
|
||||
}
|
||||
|
||||
func (LeaseList) SwaggerDoc() map[string]string {
|
||||
@@ -50,7 +50,7 @@ func (LeaseList) SwaggerDoc() map[string]string {
|
||||
var map_LeaseSpec = map[string]string{
|
||||
"": "LeaseSpec is a specification of a Lease.",
|
||||
"holderIdentity": "holderIdentity contains the identity of the holder of a current lease.",
|
||||
"leaseDurationSeconds": "leaseDurationSeconds is a duration that candidates for a lease need to wait to force acquire it. This is measure against time of last observed RenewTime.",
|
||||
"leaseDurationSeconds": "leaseDurationSeconds is a duration that candidates for a lease need to wait to force acquire it. This is measure against time of last observed renewTime.",
|
||||
"acquireTime": "acquireTime is a time when the current lease was acquired.",
|
||||
"renewTime": "renewTime is a time when the current holder of a lease has last updated the lease.",
|
||||
"leaseTransitions": "leaseTransitions is the number of transitions of a lease between holders.",
|
||||
|
||||
Reference in New Issue
Block a user