Merge pull request #432 from furkatgofurov7/remove-sandbox

🌱 Rename 'rancher-sandbox/rancher-turtles' to 'rancher/turtles'
rancher · Mar 20, 2024 · b0c5cad · b0c5cad
2 parents 1527ae7 + 36fe462
commit b0c5cad
Show file tree

Hide file tree

Showing 68 changed files with 162 additions and 162 deletions.
diff --git a/.github/workflows/nightly-chart-and-image-publish.yaml b/.github/workflows/nightly-chart-and-image-publish.yaml
@@ -8,7 +8,7 @@ on:
 env:
   TAG: v0.0.0-${{ github.sha }}
   REGISTRY: ghcr.io
-  PROD_ORG: rancher-sandbox
+  PROD_ORG: rancher
 
 jobs:
   build-and-publish-ghcr:

diff --git a/.github/workflows/nightly-test-release.yaml b/.github/workflows/nightly-test-release.yaml
@@ -96,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       PROD_REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
-      PROD_ORG: rancher-sandbox
+      PROD_ORG: rancher
       RELEASE_DIR: .cr-release-packages
     steps:
       - name: Checkout

diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
@@ -40,7 +40,7 @@ on:
         type: string
         description: Organization part of the image name
         required: false
-        default: "rancher-sandbox"
+        default: "rancher"
 
 jobs:
   build:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -88,7 +88,7 @@ jobs:
       TAG: ${{ github.ref_name }}
       CONTROLLER_IMG: ${{ vars.REGISTRY_IMAGE }}
       PROD_REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
-      PROD_ORG: rancher-sandbox
+      PROD_ORG: rancher
       RELEASE_DIR: .cr-release-packages
       CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     steps:

diff --git a/.github/workflows/release_build/action.yaml b/.github/workflows/release_build/action.yaml
@@ -12,7 +12,7 @@ inputs:
   org:
     description: "Organization part of the image path"
     required: false
-    default: "rancher-sandbox"
+    default: "rancher"
     type: string
   registry:
     description: "The registry to login"

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d
         with:
-          image-ref: 'ghcr.io/rancher-sandbox/rancher-turtles-amd64:${{ github.sha }}'
+          image-ref: 'ghcr.io/rancher/turtles-amd64:${{ github.sha }}'
           format: 'sarif'
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH'

diff --git a/.golangci.yml b/.golangci.yml
@@ -29,7 +29,7 @@ linters-settings:
   lll:
     line-length: 150
   goimports:
-    local-prefixes: github.com/rancher-sandbox/rancher-turtles
+    local-prefixes: github.com/rancher/turtles
   gci:
     custom-order: true
     sections:
@@ -38,7 +38,7 @@ linters-settings:
       - "dot"
       - "default"
       - "prefix(sigs.k8s.io/cluster-api)"
-      - "prefix(github.com/rancher-sandbox/rancher-turtles)"
+      - "prefix(github.com/rancher/turtles)"
     wsl:
       force-err-cuddling: false
   importas:
@@ -58,11 +58,11 @@ linters-settings:
         - pkg: k8s.io/client-go/kubernetes/scheme
           alias: clientgoscheme
        # Rancher Turtles
-        - pkg: github.com/rancher-sandbox/rancher-turtles/util/naming
+        - pkg: github.com/rancher/turtles/util/naming
           alias: turtlesnaming
-        - pkg: github.com/rancher-sandbox/rancher-turtles/internal/rancher/provisioning/v1
+        - pkg: github.com/rancher/turtles/internal/rancher/provisioning/v1
           alias: provisioningv1
-        - pkg: github.com/rancher-sandbox/rancher-turtles/internal/rancher/management/v3
+        - pkg: github.com/rancher/turtles/internal/rancher/management/v3
           alias: managementv3
         # Controller Runtime
         - pkg: sigs.k8s.io/controller-runtime

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,4 +1,4 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence.
 
-*       @rancher-sandbox/team-highlander
+*       @rancher/highlander
diff --git a/Dockerfile b/Dockerfile
@@ -54,7 +54,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot-${ARCH}
-LABEL org.opencontainers.image.source=https://github.com/rancher-sandbox/rancher-turtles
+LABEL org.opencontainers.image.source=https://github.com/rancher/turtles
 WORKDIR /
 COPY --from=builder /workspace/manager .
 # Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ SHELL = /usr/bin/env bash -o pipefail
 #
 GO_VERSION ?= 1.22.0
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
-REPO ?= rancher-sandbox/rancher-turtles
+REPO ?= rancher/turtles
 
 # Use GOPROXY environment variable if set
 GOPROXY := $(shell go env GOPROXY)
@@ -54,7 +54,7 @@ export KREW_ROOT := $(abspath $(TOOLS_BIN_DIR))
 export PATH := $(KREW_ROOT)/bin:$(PATH)
 
 # Set --output-base for conversion-gen if we are not within GOPATH
-ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher-sandbox/rancher-turtles)
+ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher/turtles)
 	CONVERSION_GEN_OUTPUT_BASE := --output-base=$(ROOT_DIR)
 else
 	export GOPATH := $(shell go env GOPATH)
@@ -147,8 +147,8 @@ TAG ?= dev
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm64 s390x
 REGISTRY ?= ghcr.io
-ORG ?= rancher-sandbox
-CONTROLLER_IMAGE_NAME ?= rancher-turtles
+ORG ?= rancher
+CONTROLLER_IMAGE_NAME ?= turtles
 CONTROLLER_IMG ?= $(REGISTRY)/$(ORG)/$(CONTROLLER_IMAGE_NAME)
 MANIFEST_IMG ?= $(CONTROLLER_IMG)-$(ARCH)
 CONTROLLER_IMAGE_VERSION ?= $(shell git describe --abbrev=0 2>/dev/null)
@@ -165,7 +165,7 @@ CHART_RELEASE_DIR ?= $(RELEASE_DIR)/$(CHART_DIR)
 
 # Repo
 GH_ORG_NAME ?= $ORG
-GH_REPO_NAME ?= rancher-turtles
+GH_REPO_NAME ?= turtles
 GH_REPO ?= $(GH_ORG_NAME)/$(GH_REPO_NAME)
 
 # Allow overriding the imagePullPolicy

diff --git a/PROJECT b/PROJECT
@@ -6,7 +6,7 @@ domain: cattle.io
 layout:
 - go.kubebuilder.io/v4
 projectName: rancher-turtles
-repo: github.com/rancher-sandbox/rancher-turtles
+repo: github.com/rancher/turtles
 resources:
 - api:
     crdVersion: v1
@@ -15,6 +15,6 @@ resources:
   domain: cattle.io
   group: turtles-capi
   kind: CAPIProvider
-  path: github.com/rancher-sandbox/rancher-turtles/api/v1alpha1
+  path: github.com/rancher/turtles/api/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <img src="./logos/cupid.png" width="50%" height="50%">
 
-[![Nightly e2e tests](https://github.com/rancher-sandbox/rancher-turtles/actions/workflows/e2e-long.yaml/badge.svg)](https://github.com/rancher-sandbox/rancher-turtles/actions/workflows/e2e-long.yaml)
+[![Nightly e2e tests](https://github.com/rancher/turtles/actions/workflows/e2e-long.yaml/badge.svg)](https://github.com/rancher/turtles/actions/workflows/e2e-long.yaml)
 
 # Rancher Turtles
 

diff --git a/Tiltfile b/Tiltfile
@@ -13,7 +13,7 @@ version_settings(True, ">=0.22.2")
 settings = {
     "k8s_context": os.getenv("RT_K8S_CONTEXT", "rancher-desktop"),
     "debug": {},
-    "default_registry": "docker.io/rancher-sandbox"
+    "default_registry": "docker.io/rancher"
 }
 
 # global settings
@@ -40,7 +40,7 @@ always_enable_projects = ["turtles"]
 projects = {
     "turtles": {
         "context": ".",
-        "image": "ghcr.io/rancher-sandbox/rancher-turtles:dev",
+        "image": "ghcr.io/rancher/turtles:dev",
         "live_reload_deps": [
             "main.go",
             "go.mod",

diff --git a/charts/rancher-turtles/Chart.yaml b/charts/rancher-turtles/Chart.yaml
@@ -4,8 +4,8 @@ type: application
 version: 0.0.0
 appVersion: "0.0.0"
 description: Rancher Turtles is a extension to Rancher that brings full Cluster API integration to Rancher.
-home: https://github.com/rancher-sandbox/rancher-turtles/
-icon: https://raw.githubusercontent.com/rancher-sandbox/rancher-turtles/main/logos/capi.svg
+home: https://github.com/rancher/turtles/
+icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg
 keywords:
 - rancher
 - cluster-api

diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-        - image: ghcr.io/rancher-sandbox/rancher-turtles:dev
+        - image: ghcr.io/rancher/turtles:dev
           name: manager
diff --git a/docs/release.md b/docs/release.md
@@ -9,7 +9,7 @@
 1. Clone the repository locally: 
 
 ```bash
-git clone [email protected]:rancher-sandbox/rancher-turtles.git
+git clone [email protected]:rancher/turtles.git
 ```
 
 2. Depending on whether you are cutting a minor or patch release, the process varies.
@@ -19,7 +19,7 @@ git clone [email protected]:rancher-sandbox/rancher-turtles.git
         Create a new release branch (i.e release-X) and push it to the upstream repository.
 
         ```bash
-            # Note: `upstream` must be the remote pointing to `github.com/rancher-sandbox/rancher-turtles`.
+            # Note: `upstream` must be the remote pointing to `github.com/rancher/turtles`.
             git checkout -b release-0.4
             git push -u upstream release-0.4
             # Export the tag of the minor release to be cut, e.g.:
@@ -30,7 +30,7 @@ git clone [email protected]:rancher-sandbox/rancher-turtles.git
         Use existing release branch.
 
         ```bash
-            # Note: `upstream` must be the remote pointing to `github.com/rancher-sandbox/rancher-turtles`
+            # Note: `upstream` must be the remote pointing to `github.com/rancher/turtles`
             git checkout upstream/release-0.4
             # Export the tag of the patch release to be cut, e.g.:
             export RELEASE_TAG=v0.4.1
@@ -45,7 +45,7 @@ git tag -s -a ${RELEASE_TAG} -m ${RELEASE_TAG}
 git push upstream ${RELEASE_TAG}
 ```
 
-This will trigger a [release GitHub action](https://github.com/rancher-sandbox/rancher-turtles/blob/main/.github/workflows/release.yaml) that creates a release with Rancher Turtles components.
+This will trigger a [release GitHub action](https://github.com/rancher/turtles/blob/main/.github/workflows/release.yaml) that creates a release with Rancher Turtles components.
 If you are cutting a new minor/major release, please follow the [next step](#post-release-steps-in-rancher-turtles-docs) below, otherwise skip.
 
 ## Post-release steps in Rancher Turtles Docs
@@ -57,7 +57,7 @@ If a new minor or major branch was created, there are some post-release actions
 1. Clone the Rancher Turtles Docs repository locally: 
 
 ```bash
-git clone [email protected]:rancher-sandbox/rancher-turtles-docs.git
+git clone [email protected]:rancher/turtles-docs.git
 ```
 
 2. Export the tag of the minor/major release, create a signed/annotated tag and push it:
@@ -70,7 +70,7 @@ export RELEASE_TAG=v0.4
 git tag -s -a ${RELEASE_TAG} -m ${RELEASE_TAG}
 
 # Push tags
-# Note: `upstream` must be the remote pointing to `github.com/rancher-sandbox/rancher-turtles-docs`
+# Note: `upstream` must be the remote pointing to `github.com/rancher/turtles-docs`
 git push upstream ${RELEASE_TAG}
 ```
 
@@ -80,15 +80,15 @@ This step is automatic, however it requires temporarily adjusting repo permissio
 
 1. Ask a team member or directly adjust `Docs repo > Settings > Rules > Rulesets > main > Enforcement status > Disabled`.
 
-2. Wait for the [version publish workflow](https://github.com/rancher-sandbox/rancher-turtles-docs/actions/workflows/version-publish.yamll) to finish.
+2. Wait for the [version publish workflow](https://github.com/rancher/turtles-docs/actions/workflows/version-publish.yamll) to finish.
 
 3. Ask a team member or directly adjust `Docs repo > Settings > Rules > Rulesets > main > Enforcement status > Active`.
 
-Example version update patch: https://github.com/rancher-sandbox/rancher-turtles-docs/commit/d36f0de97c5b5594cd8a396d6780761b6e106e3f
+Example version update patch: https://github.com/rancher/turtles-docs/commit/d36f0de97c5b5594cd8a396d6780761b6e106e3f
 
 ### Deploy site to Pages
 
-1. Manually run [publish workflow](https://github.com/rancher-sandbox/rancher-turtles-docs/actions/workflows/publish.yaml) to force rollout of updated docs version.
+1. Manually run [publish workflow](https://github.com/rancher/turtles-docs/actions/workflows/publish.yaml) to force rollout of updated docs version.
 
 ## Versioning
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
-module github.com/rancher-sandbox/rancher-turtles
+module github.com/rancher/turtles
 
-go 1.22
+go 1.22.0
 
 require (
 	github.com/go-logr/logr v1.3.0

diff --git a/go.work.example b/go.work.example
@@ -1,4 +1,4 @@
-go 1.22
+go 1.22.0
 
 use (
 	./rancher-turtles

diff --git a/internal/api/wrapper.go b/internal/api/wrapper.go
@@ -21,7 +21,7 @@ import (
 
 	operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
 
-	turtlesv1 "github.com/rancher-sandbox/rancher-turtles/api/v1alpha1"
+	turtlesv1 "github.com/rancher/turtles/api/v1alpha1"
 )
 
 var (

diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go
@@ -32,7 +32,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	turtlescattleiov1alpha1 "github.com/rancher-sandbox/rancher-turtles/api/v1alpha1"
+	turtlescattleiov1alpha1 "github.com/rancher/turtles/api/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/internal/controllers/capiprovider_controller.go b/internal/controllers/capiprovider_controller.go
@@ -29,8 +29,8 @@ import (
 
 	operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
 
-	turtlesv1 "github.com/rancher-sandbox/rancher-turtles/api/v1alpha1"
-	"github.com/rancher-sandbox/rancher-turtles/internal/sync"
+	turtlesv1 "github.com/rancher/turtles/api/v1alpha1"
+	"github.com/rancher/turtles/internal/sync"
 )
 
 // CAPIProviderReconciler reconciles a CAPIProvider object.

diff --git a/internal/controllers/capiprovider_controller_test.go b/internal/controllers/capiprovider_controller_test.go
@@ -20,8 +20,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	turtlesv1 "github.com/rancher-sandbox/rancher-turtles/api/v1alpha1"
-	"github.com/rancher-sandbox/rancher-turtles/internal/sync"
+	turtlesv1 "github.com/rancher/turtles/api/v1alpha1"
+	"github.com/rancher/turtles/internal/sync"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"

diff --git a/internal/controllers/helpers.go b/internal/controllers/helpers.go
@@ -40,8 +40,8 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	utilyaml "sigs.k8s.io/cluster-api/util/yaml"
 
-	managementv3 "github.com/rancher-sandbox/rancher-turtles/internal/rancher/management/v3"
-	"github.com/rancher-sandbox/rancher-turtles/util"
+	managementv3 "github.com/rancher/turtles/internal/rancher/management/v3"
+	"github.com/rancher/turtles/util"
 )
 
 const (

diff --git a/internal/controllers/import_controller.go b/internal/controllers/import_controller.go
@@ -42,11 +42,11 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/predicates"
 
-	provisioningv1 "github.com/rancher-sandbox/rancher-turtles/internal/rancher/provisioning/v1"
-	"github.com/rancher-sandbox/rancher-turtles/util"
-	turtlesannotations "github.com/rancher-sandbox/rancher-turtles/util/annotations"
-	turtlesnaming "github.com/rancher-sandbox/rancher-turtles/util/naming"
-	turtlespredicates "github.com/rancher-sandbox/rancher-turtles/util/predicates"
+	provisioningv1 "github.com/rancher/turtles/internal/rancher/provisioning/v1"
+	"github.com/rancher/turtles/util"
+	turtlesannotations "github.com/rancher/turtles/util/annotations"
+	turtlesnaming "github.com/rancher/turtles/util/naming"
+	turtlespredicates "github.com/rancher/turtles/util/predicates"
 )
 
 // CAPIImportReconciler represents a reconciler for importing CAPI clusters in Rancher.

diff --git a/internal/controllers/import_controller_test.go b/internal/controllers/import_controller_test.go
@@ -25,11 +25,11 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/rancher-sandbox/rancher-turtles/internal/controllers/testdata"
-	managementv3 "github.com/rancher-sandbox/rancher-turtles/internal/rancher/management/v3"
-	provisioningv1 "github.com/rancher-sandbox/rancher-turtles/internal/rancher/provisioning/v1"
-	"github.com/rancher-sandbox/rancher-turtles/internal/test"
-	turtlesnaming "github.com/rancher-sandbox/rancher-turtles/util/naming"
+	"github.com/rancher/turtles/internal/controllers/testdata"
+	managementv3 "github.com/rancher/turtles/internal/rancher/management/v3"
+	provisioningv1 "github.com/rancher/turtles/internal/rancher/provisioning/v1"
+	"github.com/rancher/turtles/internal/test"
+	turtlesnaming "github.com/rancher/turtles/util/naming"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

diff --git a/internal/controllers/import_controller_v3.go b/internal/controllers/import_controller_v3.go
@@ -44,10 +44,10 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/predicates"
 
-	managementv3 "github.com/rancher-sandbox/rancher-turtles/internal/rancher/management/v3"
-	"github.com/rancher-sandbox/rancher-turtles/util"
-	turtlesannotations "github.com/rancher-sandbox/rancher-turtles/util/annotations"
-	turtlespredicates "github.com/rancher-sandbox/rancher-turtles/util/predicates"
+	managementv3 "github.com/rancher/turtles/internal/rancher/management/v3"
+	"github.com/rancher/turtles/util"
+	turtlesannotations "github.com/rancher/turtles/util/annotations"
+	turtlespredicates "github.com/rancher/turtles/util/predicates"
 )
 
 // CAPIImportManagementV3Reconciler represents a reconciler for importing CAPI clusters in Rancher.
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ import ( @@
     	operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
-    	turtlesv1 "github.com/rancher-sandbox/rancher-turtles/api/v1alpha1"
+    	turtlesv1 "github.com/rancher/turtles/api/v1alpha1"
     )
     var (
@@ Expand Down @@