Fix: prevent overriding k3s API CRDs

Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>
rancher · Sep 4, 2024 · bffb4cb · bffb4cb
1 parent 129906a
commit bffb4cb
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 67 deletions.
diff --git a/exp/etcdrestore/api/k3s/v1/doc.go → api/rancher/k3s/v1/doc.go b/exp/etcdrestore/api/k3s/v1/doc.go → api/rancher/k3s/v1/doc.go
diff --git a/...tcdrestore/api/k3s/v1/etcdsnapshotfile.go → api/rancher/k3s/v1/etcdsnapshotfile.go b/...tcdrestore/api/k3s/v1/etcdsnapshotfile.go → api/rancher/k3s/v1/etcdsnapshotfile.go
diff --git a/...cdrestore/api/k3s/v1/groupversion_info.go → api/rancher/k3s/v1/groupversion_info.go b/...cdrestore/api/k3s/v1/groupversion_info.go → api/rancher/k3s/v1/groupversion_info.go
diff --git a/...store/api/k3s/v1/zz_generated.deepcopy.go → api/rancher/k3s/v1/zz_generated.deepcopy.go b/...store/api/k3s/v1/zz_generated.deepcopy.go → api/rancher/k3s/v1/zz_generated.deepcopy.go
diff --git a/exp/etcdrestore/config/crd/bases/k3s.cattle.io_etcdsnapshotfiles.yaml b/exp/etcdrestore/config/crd/bases/k3s.cattle.io_etcdsnapshotfiles.yaml
diff --git a/exp/etcdrestore/controllers/etcdmachinesnapshot_controller.go b/exp/etcdrestore/controllers/etcdmachinesnapshot_controller.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"time"
 
-	k3sv1 "github.com/rancher/turtles/exp/etcdrestore/api/k3s/v1"
+	k3sv1 "github.com/rancher/turtles/api/rancher/k3s/v1"
 	snapshotrestorev1 "github.com/rancher/turtles/exp/etcdrestore/api/v1alpha1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/exp/etcdrestore/main.go b/exp/etcdrestore/main.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	k3sv1 "github.com/rancher/turtles/exp/etcdrestore/api/k3s/v1"
+	k3sv1 "github.com/rancher/turtles/api/rancher/k3s/v1"
 	snapshotrestorev1 "github.com/rancher/turtles/exp/etcdrestore/api/v1alpha1"
 	expcontrollers "github.com/rancher/turtles/exp/etcdrestore/controllers"
 	expwebhooks "github.com/rancher/turtles/exp/etcdrestore/webhooks"