Skip to content

Commit 1624cca

Browse files
mandremandre
authored
Merge pull request #333 from k-orc/gomod-v2
Change module name to /v2
2 parents 7a0ab53 + 1fb05e1 commit 1624cca

File tree

192 files changed

+1036
-1036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+1036
-1036
lines changed

‎api_violations.report‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/api/v1alpha1,SubnetFilter,IPv6
2-
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/api/v1alpha1,SubnetResourceSpec,IPv6
3-
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/api/v1alpha1,SubnetResourceStatus,IPv6AddressMode
4-
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/api/v1alpha1,SubnetResourceStatus,IPv6RAMode
1+
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1,SubnetFilter,IPv6
2+
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1,SubnetResourceSpec,IPv6
3+
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1,SubnetResourceStatus,IPv6AddressMode
4+
API rule violation: names_match,github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1,SubnetResourceStatus,IPv6RAMode
55
API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI
66
API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState
77
API rule violation: names_match,k8s.io/api/core/v1,DaemonEndpoint,Port

‎cmd/manager/main.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ import (
2727
ctrl "sigs.k8s.io/controller-runtime"
2828
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2929

30-
"github.com/k-orc/openstack-resource-controller/internal/controllers/flavor"
31-
"github.com/k-orc/openstack-resource-controller/internal/controllers/generic/interfaces"
32-
"github.com/k-orc/openstack-resource-controller/internal/controllers/image"
33-
"github.com/k-orc/openstack-resource-controller/internal/controllers/network"
34-
"github.com/k-orc/openstack-resource-controller/internal/controllers/port"
35-
"github.com/k-orc/openstack-resource-controller/internal/controllers/router"
36-
"github.com/k-orc/openstack-resource-controller/internal/controllers/routerinterface"
37-
"github.com/k-orc/openstack-resource-controller/internal/controllers/securitygroup"
38-
"github.com/k-orc/openstack-resource-controller/internal/controllers/server"
39-
"github.com/k-orc/openstack-resource-controller/internal/controllers/subnet"
40-
internalmanager "github.com/k-orc/openstack-resource-controller/internal/manager"
41-
"github.com/k-orc/openstack-resource-controller/internal/scheme"
42-
"github.com/k-orc/openstack-resource-controller/internal/scope"
30+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/flavor"
31+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/generic/interfaces"
32+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/image"
33+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/network"
34+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/port"
35+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/router"
36+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/routerinterface"
37+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/securitygroup"
38+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/server"
39+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/subnet"
40+
internalmanager "github.com/k-orc/openstack-resource-controller/v2/internal/manager"
41+
"github.com/k-orc/openstack-resource-controller/v2/internal/scheme"
42+
"github.com/k-orc/openstack-resource-controller/v2/internal/scope"
4343
// +kubebuilder:scaffold:imports
4444
)
4545

‎cmd/models-schema/zz_generated.openapi.go‎

Lines changed: 358 additions & 358 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/resource-generator/data/adapter.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package {{ .NameLower }}
1818

1919
import (
20-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
21-
"github.com/k-orc/openstack-resource-controller/internal/controllers/generic/interfaces"
20+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
21+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/generic/interfaces"
2222
)
2323

2424
// Fundamental types

‎cmd/resource-generator/data/controller.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package {{ .NameLower }}
1919
import (
2020
corev1 "k8s.io/api/core/v1"
2121

22-
orcstrings "github.com/k-orc/openstack-resource-controller/internal/util/strings"
23-
"github.com/k-orc/openstack-resource-controller/internal/util/dependency"
22+
orcstrings "github.com/k-orc/openstack-resource-controller/v2/internal/util/strings"
23+
"github.com/k-orc/openstack-resource-controller/v2/internal/util/dependency"
2424
)
2525

2626
var (

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/k-orc/openstack-resource-controller
1+
module github.com/k-orc/openstack-resource-controller/v2
22

33
go 1.23.0
44

‎hack/update-codegen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ kube::codegen::gen_client \
6565
--with-watch \
6666
--applyconfig-openapi-schema "$openapi" \
6767
--output-dir "${PROJECT_ROOT}/${GENERATED_PKG}" \
68-
--output-pkg github.com/k-orc/openstack-resource-controller/${GENERATED_PKG} \
68+
--output-pkg github.com/k-orc/openstack-resource-controller/v2/${GENERATED_PKG} \
6969
--versioned-name clientset \
7070
--boilerplate "${SCRIPT_ROOT}/boilerplate.go.txt" \
7171
--one-input-api "api" \

‎internal/controllers/flavor/actuator.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"k8s.io/utils/ptr"
2626
ctrl "sigs.k8s.io/controller-runtime"
2727

28-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
29-
generic "github.com/k-orc/openstack-resource-controller/internal/controllers/generic/interfaces"
30-
"github.com/k-orc/openstack-resource-controller/internal/controllers/generic/progress"
31-
osclients "github.com/k-orc/openstack-resource-controller/internal/osclients"
32-
orcerrors "github.com/k-orc/openstack-resource-controller/internal/util/errors"
28+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
29+
generic "github.com/k-orc/openstack-resource-controller/v2/internal/controllers/generic/interfaces"
30+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/generic/progress"
31+
osclients "github.com/k-orc/openstack-resource-controller/v2/internal/osclients"
32+
orcerrors "github.com/k-orc/openstack-resource-controller/v2/internal/util/errors"
3333
)
3434

3535
// OpenStack resource types

‎internal/controllers/flavor/actuator_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/utils/ptr"
1313

14-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
15-
"github.com/k-orc/openstack-resource-controller/internal/osclients"
14+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
15+
"github.com/k-orc/openstack-resource-controller/v2/internal/osclients"
1616
)
1717

1818
var (

‎internal/controllers/flavor/controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
ctrl "sigs.k8s.io/controller-runtime"
2424
"sigs.k8s.io/controller-runtime/pkg/controller"
2525

26-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
26+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
2727

28-
"github.com/k-orc/openstack-resource-controller/internal/controllers/generic/interfaces"
29-
"github.com/k-orc/openstack-resource-controller/internal/controllers/generic/reconciler"
30-
"github.com/k-orc/openstack-resource-controller/internal/scope"
31-
"github.com/k-orc/openstack-resource-controller/internal/util/credentials"
28+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/generic/interfaces"
29+
"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/generic/reconciler"
30+
"github.com/k-orc/openstack-resource-controller/v2/internal/scope"
31+
"github.com/k-orc/openstack-resource-controller/v2/internal/util/credentials"
3232
)
3333

3434
const controllerName = "flavor"

0 commit comments

Comments
 (0)