Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Commit

Permalink
Fix composit operator order after delete
Browse files Browse the repository at this point in the history
  • Loading branch information
mhmxs committed Mar 29, 2022
1 parent 9bbdbb4 commit 6edce63
Show file tree
Hide file tree
Showing 92 changed files with 190 additions and 149 deletions.
10 changes: 5 additions & 5 deletions controllers/storageoscluster/after_install_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"context"
"fmt"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/kustomize"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kustomize"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
storageoscomv1 "github.com/storageos/operator/api/v1"
policyv1beta1 "k8s.io/api/policy/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
12 changes: 6 additions & 6 deletions controllers/storageoscluster/api-manager_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"os"
"time"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/kustomize"
"github.com/darkowlzz/operator-toolkit/declarative/transform"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kustomize"
"github.com/ondat/operator-toolkit/declarative/transform"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
8 changes: 4 additions & 4 deletions controllers/storageoscluster/before_install_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package storageoscluster
import (
"context"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/kustomize/api/filesys"
Expand Down
6 changes: 3 additions & 3 deletions controllers/storageoscluster/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"fmt"

compositev1 "github.com/darkowlzz/operator-toolkit/controller/composite/v1"
"github.com/darkowlzz/operator-toolkit/object"
operatorv1 "github.com/darkowlzz/operator-toolkit/operator/v1"
"github.com/go-logr/logr"
compositev1 "github.com/ondat/operator-toolkit/controller/composite/v1"
"github.com/ondat/operator-toolkit/object"
operatorv1 "github.com/ondat/operator-toolkit/operator/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
10 changes: 5 additions & 5 deletions controllers/storageoscluster/csi_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"os"
"time"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/kustomize"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kustomize"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
10 changes: 5 additions & 5 deletions controllers/storageoscluster/node-manager_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"sync"
"time"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/kustomize"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/go-logr/logr"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kustomize"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
appsv1 "k8s.io/api/apps/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
12 changes: 6 additions & 6 deletions controllers/storageoscluster/node_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"strconv"
"time"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/kustomize"
"github.com/darkowlzz/operator-toolkit/declarative/transform"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kustomize"
"github.com/ondat/operator-toolkit/declarative/transform"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
10 changes: 5 additions & 5 deletions controllers/storageoscluster/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import (
"io/ioutil"
"time"

operatorv1 "github.com/darkowlzz/operator-toolkit/operator/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/executor"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/darkowlzz/operator-toolkit/telemetry"
operatorv1 "github.com/ondat/operator-toolkit/operator/v1"
"github.com/ondat/operator-toolkit/operator/v1/executor"
"github.com/ondat/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/telemetry"
"k8s.io/cli-runtime/pkg/genericclioptions"
tappv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/kustomize/api/filesys"

"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kubectl"
)

const instrumentationName = "github.com/storageos/operator/controllers/storageoscluster"
Expand Down
10 changes: 5 additions & 5 deletions controllers/storageoscluster/portal-manager_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"sync"
"time"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/kustomize"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kustomize"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
appsv1 "k8s.io/api/apps/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
12 changes: 6 additions & 6 deletions controllers/storageoscluster/scheduler_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"os"
"time"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/kustomize"
"github.com/darkowlzz/operator-toolkit/declarative/transform"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/kustomize"
"github.com/ondat/operator-toolkit/declarative/transform"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
10 changes: 5 additions & 5 deletions controllers/storageoscluster/storageclass_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"errors"
"fmt"

"github.com/darkowlzz/operator-toolkit/declarative"
"github.com/darkowlzz/operator-toolkit/declarative/kubectl"
"github.com/darkowlzz/operator-toolkit/declarative/transform"
eventv1 "github.com/darkowlzz/operator-toolkit/event/v1"
"github.com/darkowlzz/operator-toolkit/operator/v1/operand"
"github.com/ondat/operator-toolkit/declarative"
"github.com/ondat/operator-toolkit/declarative/kubectl"
"github.com/ondat/operator-toolkit/declarative/transform"
eventv1 "github.com/ondat/operator-toolkit/event/v1"
"github.com/ondat/operator-toolkit/operator/v1/operand"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/kustomize/api/filesys"
Expand Down
10 changes: 5 additions & 5 deletions controllers/storageoscluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"context"
"fmt"

compositev1 "github.com/darkowlzz/operator-toolkit/controller/composite/v1"
"github.com/darkowlzz/operator-toolkit/declarative/loader"
"github.com/darkowlzz/operator-toolkit/operator/v1/executor"
tkpredicate "github.com/darkowlzz/operator-toolkit/predicate"
"github.com/darkowlzz/operator-toolkit/telemetry"
compositev1 "github.com/ondat/operator-toolkit/controller/composite/v1"
"github.com/ondat/operator-toolkit/declarative/loader"
"github.com/ondat/operator-toolkit/operator/v1/executor"
tkpredicate "github.com/ondat/operator-toolkit/predicate"
"github.com/ondat/operator-toolkit/telemetry"
"k8s.io/apimachinery/pkg/runtime"
tappv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
8 changes: 4 additions & 4 deletions controllers/webhook/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"time"

"github.com/darkowlzz/operator-toolkit/singleton"
"github.com/darkowlzz/operator-toolkit/telemetry"
tkadmission "github.com/darkowlzz/operator-toolkit/webhook/admission"
"github.com/darkowlzz/operator-toolkit/webhook/builder"
"github.com/go-logr/logr"
"github.com/ondat/operator-toolkit/singleton"
"github.com/ondat/operator-toolkit/telemetry"
tkadmission "github.com/ondat/operator-toolkit/webhook/admission"
"github.com/ondat/operator-toolkit/webhook/builder"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.16

require (
github.com/blang/semver v3.5.1+incompatible
github.com/darkowlzz/operator-toolkit v0.0.0-20210721205719-05b03cd74f02
github.com/go-logr/logr v0.3.0
github.com/golang/mock v1.6.0
github.com/ondat/operator-toolkit v0.0.0-20220329091754-84ef19f3309b
github.com/onsi/ginkgo v1.14.1
github.com/onsi/gomega v1.10.2
github.com/storageos/go-api v0.0.0-20220209143821-59d68c680d51
Expand Down
10 changes: 3 additions & 7 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/darkowlzz/operator-toolkit v0.0.0-20210721205719-05b03cd74f02 h1:TeibrmJ0YXteON6uHV8mIqk8N5TbVMZgPWEvZAfkNmU=
github.com/darkowlzz/operator-toolkit v0.0.0-20210721205719-05b03cd74f02/go.mod h1:aER+N+eTGLqwro+bbEiKtttS8hU/BxiozevFTC1xv3c=
github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down Expand Up @@ -320,7 +318,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
Expand Down Expand Up @@ -565,6 +562,8 @@ github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/ondat/operator-toolkit v0.0.0-20220329091754-84ef19f3309b h1:YEFdTl2g8rkdyK7tcjf8S+Otz0farThGVJ7fiLJKcbM=
github.com/ondat/operator-toolkit v0.0.0-20220329091754-84ef19f3309b/go.mod h1:uB4vtqBG1OcSl08zabuY+1XbCiKdM9B12rUb8W0BqpI=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.4.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down Expand Up @@ -828,8 +827,8 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -876,7 +875,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
Expand Down Expand Up @@ -948,7 +946,6 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down Expand Up @@ -1037,7 +1034,6 @@ golang.org/x/tools v0.0.0-20200714190737-9048b464a08d/go.mod h1:njjCfa9FT2d7l9Bc
golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200904185747-39188db58858 h1:xLt+iB5ksWcZVxqc+g9K41ZHy+6MKWfXCDsjSThnsPA=
golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
Expand Down
2 changes: 1 addition & 1 deletion internal/transform/common.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package transform

import (
"github.com/darkowlzz/operator-toolkit/declarative/transform"
"github.com/ondat/operator-toolkit/declarative/transform"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
"sigs.k8s.io/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/transform/configmap.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package transform

import (
"github.com/darkowlzz/operator-toolkit/declarative/transform"
"github.com/ondat/operator-toolkit/declarative/transform"
"sigs.k8s.io/kustomize/kyaml/yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/transform/envvar.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package transform

import (
"github.com/darkowlzz/operator-toolkit/declarative/transform"
"github.com/ondat/operator-toolkit/declarative/transform"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/transform/kubeschedulerconfiguration.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package transform

import (
"github.com/darkowlzz/operator-toolkit/declarative/transform"
"github.com/ondat/operator-toolkit/declarative/transform"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/transform/podtemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package transform
import (
"fmt"

"github.com/darkowlzz/operator-toolkit/declarative/transform"
"github.com/ondat/operator-toolkit/declarative/transform"
corev1 "k8s.io/api/core/v1"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/transform/rolebinding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package transform
import (
"fmt"

"github.com/darkowlzz/operator-toolkit/declarative/transform"
"github.com/ondat/operator-toolkit/declarative/transform"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/transform/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

"github.com/darkowlzz/operator-toolkit/declarative/transform"
"github.com/ondat/operator-toolkit/declarative/transform"
corev1 "k8s.io/api/core/v1"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
)
Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/klog/v2"

"github.com/darkowlzz/operator-toolkit/declarative/loader"
"github.com/darkowlzz/operator-toolkit/telemetry/export"
"github.com/darkowlzz/operator-toolkit/webhook/cert"
"github.com/ondat/operator-toolkit/declarative/loader"
"github.com/ondat/operator-toolkit/telemetry/export"
"github.com/ondat/operator-toolkit/webhook/cert"
"go.uber.org/zap/zapcore"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6edce63

Please sign in to comment.