Moved all custom naming into one place
This commit is contained in:
@@ -11,10 +11,10 @@ import (
|
||||
"k8s.io/cli-runtime/pkg/genericclioptions"
|
||||
"k8s.io/klog/v2"
|
||||
|
||||
types "undecided.project/monok8s/pkg/apis/monok8s/v1alpha1"
|
||||
mkscmd "undecided.project/monok8s/pkg/cmd"
|
||||
"undecided.project/monok8s/pkg/kube"
|
||||
"undecided.project/monok8s/pkg/templates"
|
||||
monov1alpha1 "example.com/monok8s/pkg/apis/monok8s/v1alpha1"
|
||||
mkscmd "example.com/monok8s/pkg/cmd"
|
||||
"example.com/monok8s/pkg/kube"
|
||||
"example.com/monok8s/pkg/templates"
|
||||
)
|
||||
|
||||
func NewCmdAgent(flags *genericclioptions.ConfigFlags) *cobra.Command {
|
||||
@@ -26,7 +26,7 @@ func NewCmdAgent(flags *genericclioptions.ConfigFlags) *cobra.Command {
|
||||
Short: "Watch OSUpgrade resources and do nothing for now",
|
||||
RunE: func(cmd *cobra.Command, _ []string) error {
|
||||
|
||||
var cfg *types.MonoKSConfig // or value, depending on your API
|
||||
var cfg *monov1alpha1.MonoKSConfig // or value, depending on your API
|
||||
|
||||
if err := mkscmd.LoadEnvFile(envFile); err != nil {
|
||||
return fmt.Errorf("load env file %q: %w", envFile, err)
|
||||
@@ -41,7 +41,7 @@ func NewCmdAgent(flags *genericclioptions.ConfigFlags) *cobra.Command {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
gvr := schema.GroupVersionResource{Group: types.Group, Version: types.Version, Resource: "osupgrades"}
|
||||
gvr := schema.GroupVersionResource{Group: monov1alpha1.Group, Version: monov1alpha1.Version, Resource: "osupgrades"}
|
||||
ctx := cmd.Context()
|
||||
for {
|
||||
list, err := clients.Dynamic.Resource(gvr).Namespace(namespace).List(ctx, metav1.ListOptions{})
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"undecided.project/monok8s/pkg/crds"
|
||||
"undecided.project/monok8s/pkg/kube"
|
||||
"example.com/monok8s/pkg/crds"
|
||||
"example.com/monok8s/pkg/kube"
|
||||
"github.com/spf13/cobra"
|
||||
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
|
||||
@@ -3,7 +3,7 @@ package checkconfig
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"undecided.project/monok8s/pkg/config"
|
||||
"example.com/monok8s/pkg/config"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
render "undecided.project/monok8s/pkg/render"
|
||||
render "example.com/monok8s/pkg/render"
|
||||
)
|
||||
|
||||
func NewCmdCreate() *cobra.Command {
|
||||
|
||||
@@ -10,12 +10,12 @@ import (
|
||||
"k8s.io/cli-runtime/pkg/genericclioptions"
|
||||
"k8s.io/klog/v2"
|
||||
|
||||
"undecided.project/monok8s/pkg/bootstrap"
|
||||
"undecided.project/monok8s/pkg/config"
|
||||
"example.com/monok8s/pkg/bootstrap"
|
||||
"example.com/monok8s/pkg/config"
|
||||
|
||||
types "undecided.project/monok8s/pkg/apis/monok8s/v1alpha1"
|
||||
mkscmd "undecided.project/monok8s/pkg/cmd"
|
||||
"undecided.project/monok8s/pkg/templates"
|
||||
monov1alpha1 "example.com/monok8s/pkg/apis/monok8s/v1alpha1"
|
||||
mkscmd "example.com/monok8s/pkg/cmd"
|
||||
"example.com/monok8s/pkg/templates"
|
||||
)
|
||||
|
||||
func NewCmdInit(_ *genericclioptions.ConfigFlags) *cobra.Command {
|
||||
@@ -69,7 +69,7 @@ Supported formats:
|
||||
}
|
||||
}
|
||||
|
||||
var cfg *types.MonoKSConfig // or value, depending on your API
|
||||
var cfg *monov1alpha1.MonoKSConfig // or value, depending on your API
|
||||
|
||||
switch {
|
||||
case strings.TrimSpace(envFile) != "":
|
||||
|
||||
@@ -2,8 +2,8 @@ package internal
|
||||
|
||||
import (
|
||||
"github.com/spf13/cobra"
|
||||
"undecided.project/monok8s/pkg/bootstrap"
|
||||
"undecided.project/monok8s/pkg/config"
|
||||
"example.com/monok8s/pkg/bootstrap"
|
||||
"example.com/monok8s/pkg/config"
|
||||
)
|
||||
|
||||
func NewCmdInternal() *cobra.Command {
|
||||
|
||||
@@ -7,13 +7,13 @@ import (
|
||||
"github.com/spf13/cobra"
|
||||
"k8s.io/cli-runtime/pkg/genericclioptions"
|
||||
"k8s.io/klog/v2"
|
||||
agentcmd "undecided.project/monok8s/pkg/cmd/agent"
|
||||
applycmd "undecided.project/monok8s/pkg/cmd/apply"
|
||||
checkconfigcmd "undecided.project/monok8s/pkg/cmd/checkconfig"
|
||||
createcmd "undecided.project/monok8s/pkg/cmd/create"
|
||||
initcmd "undecided.project/monok8s/pkg/cmd/initcmd"
|
||||
internalcmd "undecided.project/monok8s/pkg/cmd/internal"
|
||||
versioncmd "undecided.project/monok8s/pkg/cmd/version"
|
||||
agentcmd "example.com/monok8s/pkg/cmd/agent"
|
||||
applycmd "example.com/monok8s/pkg/cmd/apply"
|
||||
checkconfigcmd "example.com/monok8s/pkg/cmd/checkconfig"
|
||||
createcmd "example.com/monok8s/pkg/cmd/create"
|
||||
initcmd "example.com/monok8s/pkg/cmd/initcmd"
|
||||
internalcmd "example.com/monok8s/pkg/cmd/internal"
|
||||
versioncmd "example.com/monok8s/pkg/cmd/version"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
buildInfo "undecided.project/monok8s/pkg/buildinfo"
|
||||
buildInfo "example.com/monok8s/pkg/buildinfo"
|
||||
)
|
||||
|
||||
func NewCmdVersion() *cobra.Command {
|
||||
|
||||
Reference in New Issue
Block a user