Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-02 22:34:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

deps: vendor node-maintenance-operator api (#1172)

Browse source 
* deps: go generate script to vendor node-maintenance-operator api folder

* deps: vendor node-maintenance-operator api folder

* operators: use vendored node-maintenance-operator api

* ci: ignore 3rdparty dir for license check
This commit is contained in:
Malte Poll 2023-02-14 18:46:48 +01:00 • committed by GitHub
parent 241d667758
commit 77216f7492
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 616 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
operators/constellation-node-operator/controllers/nodeversion_controller.go
View file

@ -34,8 +34,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/source"
nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1"
updatev1alpha1 "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api/v1alpha1"
nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1"
)
const (

2
operators/constellation-node-operator/controllers/nodeversion_controller_env_test.go
View file

@ -20,9 +20,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1"
mainconstants "github.com/edgelesssys/constellation/v2/internal/constants"
updatev1alpha1 "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api/v1alpha1"
nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1"
)
var _ = Describe("NodeVersion controller", func() {

2
operators/constellation-node-operator/controllers/nodeversion_watches.go
View file

@ -17,8 +17,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1"
updatev1alpha1 "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api/v1alpha1"
nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1"
)
// scalingGroupImageChangedPredicate checks if a scaling group has adopted a new node image for future nodes.

2
operators/constellation-node-operator/controllers/nodeversion_watches_test.go
View file

@ -19,8 +19,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1"
updatev1alpha1 "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api/v1alpha1"
nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1"
)
func TestScalingGroupImageChangedPredicate(t *testing.T) {

2
operators/constellation-node-operator/controllers/schemes_test.go
View file

@ -11,8 +11,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1"
updatev1alpha1 "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api/v1alpha1"
nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1"
"github.com/stretchr/testify/require"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
)

2
operators/constellation-node-operator/controllers/suite_test.go
View file

@ -16,7 +16,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1"
nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"k8s.io/client-go/kubernetes/scheme"

3
operators/constellation-node-operator/go.mod
View file

@ -4,6 +4,7 @@ go 1.19
replace (
github.com/edgelesssys/constellation/v2 => ./../..
github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator => ./../../3rdparty/node-maintenance-operator
github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api => ./api
)
@ -13,9 +14,9 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.1.0
github.com/edgelesssys/constellation/v2 v2.0.0
github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator v0.0.0-00010101000000-000000000000
github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api v0.0.0
github.com/googleapis/gax-go/v2 v2.7.0
github.com/medik8s/node-maintenance-operator v0.14.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.24.2
github.com/spf13/afero v1.9.3

2
operators/constellation-node-operator/go.sum
View file

@ -275,8 +275,6 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/medik8s/node-maintenance-operator v0.14.0 h1:Vt9u4C12vpQe2T1/K11fZW7kVEGkUgAj40W3YIqoxhg=
github.com/medik8s/node-maintenance-operator v0.14.0/go.mod h1:2uzTk13QX4B+9n+gtodff/TGOsrS3oIp0OdAiDZOUT8=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

2
operators/constellation-node-operator/main.go
View file

@ -31,10 +31,10 @@ import (
"github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/internal/deploy"
"github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/internal/upgrade"
nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1"
updatev1alpha1 "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api/v1alpha1"
"github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/controllers"
"github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/internal/etcd"
nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1"
//+kubebuilder:scaffold:imports
)