From 580a143086bcad84acefd90ba942f00e223c48c4 Mon Sep 17 00:00:00 2001 From: "michal.gubricky" Date: Tue, 16 Apr 2024 15:55:27 +0200 Subject: [PATCH 1/3] Make consistent naming for SovereignCloudStack organization Signed-off-by: michal.gubricky --- .github/renovate.json5 | 14 +++++++------- .github/workflows/schedule-update-bot.yaml | 2 +- PROJECT | 8 ++++---- Tiltfile | 2 +- cmd/main.go | 4 ++-- docs/develop.md | 4 ++-- go.mod | 2 +- hack/version.sh | 2 +- .../openstackclusterstackrelease_controller.go | 2 +- ...openstackclusterstackrelease_controller_test.go | 2 +- .../openstacknodeimagerelease_controller.go | 2 +- .../openstacknodeimagerelease_controller_test.go | 2 +- internal/controller/suite_test.go | 2 +- internal/test/helpers/envtest.go | 2 +- .../integration/github/integration_suite_test.go | 4 ++-- .../test/integration/github/integration_test.go | 2 +- .../integration/openstack/controller_suite_test.go | 4 ++-- .../test/integration/openstack/controller_test.go | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 50281995..c64b72b3 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,12 +7,12 @@ ":semanticCommits", "helpers:pinGitHubActionDigests", "github>whitesource/merge-confidence:beta", - "github>sovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/commitMessage.json5", - "github>sovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/approval.json5", - "github>sovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/golang.json5", - "github>sovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/groups.json5", - "github>sovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/labels.json5", - "github>sovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/regexManagers.json5" + "github>SovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/commitMessage.json5", + "github>SovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/approval.json5", + "github>SovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/golang.json5", + "github>SovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/groups.json5", + "github>SovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/labels.json5", + "github>SovereignCloudStack/cluster-stack-provider-openstack//.github/renovate/regexManagers.json5" ], platform: "github", baseBranches: ["main"], @@ -20,7 +20,7 @@ requireConfig: "ignored", timezone: "Europe/Berlin", // repo config - repositories: ["sovereignCloudStack/cluster-stack-provider-openstack"], + repositories: ["SovereignCloudStack/cluster-stack-provider-openstack"], ignorePaths: [ "**/vendor/**", "**/test/**", diff --git a/.github/workflows/schedule-update-bot.yaml b/.github/workflows/schedule-update-bot.yaml index 1c1b5075..fc070290 100644 --- a/.github/workflows/schedule-update-bot.yaml +++ b/.github/workflows/schedule-update-bot.yaml @@ -25,7 +25,7 @@ env: # yamllint disable rule:line-length jobs: update-bot: - if: github.repository == 'sovereignCloudStack/cluster-stack-provider-openstack' + if: github.repository == 'SovereignCloudStack/cluster-stack-provider-openstack' name: Renovate runs-on: ubuntu-latest steps: diff --git a/PROJECT b/PROJECT index b7b64d5f..0b351759 100644 --- a/PROJECT +++ b/PROJECT @@ -6,7 +6,7 @@ domain: clusterstack.x-k8s.io layout: - go.kubebuilder.io/v4 projectName: cspo -repo: github.com/sovereignCloudStack/cluster-stack-provider-openstack +repo: github.com/SovereignCloudStack/cluster-stack-provider-openstack resources: - api: crdVersion: v1 @@ -15,7 +15,7 @@ resources: domain: clusterstack.x-k8s.io group: infrastructure.clusterstack.x-k8s.io kind: OpenStackClusterStackRelease - path: github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1 + path: github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -24,7 +24,7 @@ resources: domain: clusterstack.x-k8s.io group: infrastructure.clusterstack.x-k8s.io kind: OpenStackClusterStackReleaseTemplate - path: github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1 + path: github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -33,6 +33,6 @@ resources: domain: clusterstack.x-k8s.io group: infrastructure.clusterstack.x-k8s.io kind: OpenStackNodeImageRelease - path: github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1 + path: github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/Tiltfile b/Tiltfile index 6e2889b8..78711aaf 100644 --- a/Tiltfile +++ b/Tiltfile @@ -75,7 +75,7 @@ COPY local_cso.yaml /local_cso.yaml def deploy_cso(): version = settings.get("cso_version") - cso_uri = "https://github.com/sovereignCloudStack/cluster-stack-operator/releases/download/{}/cso-infrastructure-components.yaml".format(version) + cso_uri = "https://github.com/SovereignCloudStack/cluster-stack-operator/releases/download/{}/cso-infrastructure-components.yaml".format(version) cmd = "curl -sSL {} | {} | kubectl apply -f -".format(cso_uri, envsubst_cmd) local(cmd, quiet = True) diff --git a/cmd/main.go b/cmd/main.go index 8e573977..83b9cf2b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -25,8 +25,8 @@ import ( githubclient "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client" "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client/fake" - apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" - "github.com/sovereignCloudStack/cluster-stack-provider-openstack/internal/controller" + apiv1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" + "github.com/SovereignCloudStack/cluster-stack-provider-openstack/internal/controller" "k8s.io/apimachinery/pkg/runtime" runtimeutils "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" diff --git a/docs/develop.md b/docs/develop.md index 1f184335..56b4c320 100644 --- a/docs/develop.md +++ b/docs/develop.md @@ -86,7 +86,7 @@ Downloading cluster-stacks can be achieved by many ways but below is a simple wa ```bash mkdir -p .release/openstack-scs-1-27-v1/ cd .release/openstack-scs-1-27-v1 -gh release download --repo sovereigncloudstack/cluster-stacks openstack-scs-1-27-v1 +gh release download --repo SovereignCloudStack/cluster-stacks openstack-scs-1-27-v1 ``` Change the repo and tag as per the requirement. You can also download it directly from browser and move it to `.release` directory. @@ -102,6 +102,6 @@ $ tree .release/openstack-scs-1-27-v1/ ``` > [!IMPORTANT] -There's an alternative way to get clusterstacks using [csmctl](https://github.com/sovereigncloudstack/csmctl). You can follow the README of csmctl for specific instructions and a good quickstart. +There's an alternative way to get clusterstacks using [csmctl](https://github.com/SovereignCloudStack/csmctl). You can follow the README of csmctl for specific instructions and a good quickstart. You can use `csmctl create` subcommand to create clusterstack locally. You'll need a csmctl.yaml file in the cluster-stack configuration directory. Please read more about creating configuration file for csmctl in the csmctl docs. diff --git a/go.mod b/go.mod index 5a21fb7d..9c8e5bd8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/sovereignCloudStack/cluster-stack-provider-openstack +module github.com/SovereignCloudStack/cluster-stack-provider-openstack go 1.21.6 diff --git a/hack/version.sh b/hack/version.sh index 9f6e486f..d5a20969 100755 --- a/hack/version.sh +++ b/hack/version.sh @@ -77,7 +77,7 @@ version::ldflags() { local key=${1} local val=${2} ldflags+=( - "-X 'github.com/sovereignCloudStack/cluster-stack-provider-openstack/pkg/csoversion.${key}=${val}'" + "-X 'github.com/SovereignCloudStack/cluster-stack-provider-openstack/pkg/csoversion.${key}=${val}'" ) } diff --git a/internal/controller/openstackclusterstackrelease_controller.go b/internal/controller/openstackclusterstackrelease_controller.go index cb4b73b3..8c995145 100644 --- a/internal/controller/openstackclusterstackrelease_controller.go +++ b/internal/controller/openstackclusterstackrelease_controller.go @@ -28,7 +28,7 @@ import ( githubclient "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client" "github.com/SovereignCloudStack/cluster-stack-operator/pkg/release" - apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" + apiv1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/controller/openstackclusterstackrelease_controller_test.go b/internal/controller/openstackclusterstackrelease_controller_test.go index 82999fad..34dbf996 100644 --- a/internal/controller/openstackclusterstackrelease_controller_test.go +++ b/internal/controller/openstackclusterstackrelease_controller_test.go @@ -25,11 +25,11 @@ import ( "time" githubmocks "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client/mocks" + apiv1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" "github.com/google/go-github/v52/github" "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/internal/controller/openstacknodeimagerelease_controller.go b/internal/controller/openstacknodeimagerelease_controller.go index 359f172c..390d1c0b 100644 --- a/internal/controller/openstacknodeimagerelease_controller.go +++ b/internal/controller/openstacknodeimagerelease_controller.go @@ -25,12 +25,12 @@ import ( "net/http" "time" + apiv1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" "github.com/gophercloud/gophercloud/v2" "github.com/gophercloud/gophercloud/v2/openstack" "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/imageimport" "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" "github.com/gophercloud/utils/v2/openstack/clientconfig" - apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/controller/openstacknodeimagerelease_controller_test.go b/internal/controller/openstacknodeimagerelease_controller_test.go index 8695fca8..778c97cd 100644 --- a/internal/controller/openstacknodeimagerelease_controller_test.go +++ b/internal/controller/openstacknodeimagerelease_controller_test.go @@ -22,12 +22,12 @@ import ( "net/http" "testing" + apiv1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/imageimport" "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" th "github.com/gophercloud/gophercloud/v2/testhelper" fakeclient "github.com/gophercloud/gophercloud/v2/testhelper/client" "github.com/gophercloud/utils/v2/openstack/clientconfig" - apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index 6934b309..7eece918 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -22,9 +22,9 @@ import ( "runtime" "testing" + apiv1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - apiv1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/test/helpers/envtest.go b/internal/test/helpers/envtest.go index fd4e3d02..121af0f7 100644 --- a/internal/test/helpers/envtest.go +++ b/internal/test/helpers/envtest.go @@ -26,8 +26,8 @@ import ( githubclient "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client" githubmocks "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client/mocks" + cspov1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" g "github.com/onsi/ginkgo/v2" - cspov1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/test/integration/github/integration_suite_test.go b/internal/test/integration/github/integration_suite_test.go index b9b59a88..0baf1719 100644 --- a/internal/test/integration/github/integration_suite_test.go +++ b/internal/test/integration/github/integration_suite_test.go @@ -21,10 +21,10 @@ import ( "time" githubclient "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client" + "github.com/SovereignCloudStack/cluster-stack-provider-openstack/internal/controller" + "github.com/SovereignCloudStack/cluster-stack-provider-openstack/internal/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/sovereignCloudStack/cluster-stack-provider-openstack/internal/controller" - "github.com/sovereignCloudStack/cluster-stack-provider-openstack/internal/test/helpers" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/internal/test/integration/github/integration_test.go b/internal/test/integration/github/integration_test.go index 6882c160..d2154774 100644 --- a/internal/test/integration/github/integration_test.go +++ b/internal/test/integration/github/integration_test.go @@ -21,9 +21,9 @@ import ( "os" "github.com/SovereignCloudStack/cluster-stack-operator/pkg/test/utils" + cspov1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - cspov1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/internal/test/integration/openstack/controller_suite_test.go b/internal/test/integration/openstack/controller_suite_test.go index ee0d2535..46d28bc1 100644 --- a/internal/test/integration/openstack/controller_suite_test.go +++ b/internal/test/integration/openstack/controller_suite_test.go @@ -21,10 +21,10 @@ import ( "time" githubclient "github.com/SovereignCloudStack/cluster-stack-operator/pkg/github/client" + "github.com/SovereignCloudStack/cluster-stack-provider-openstack/internal/controller" + "github.com/SovereignCloudStack/cluster-stack-provider-openstack/internal/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/sovereignCloudStack/cluster-stack-provider-openstack/internal/controller" - "github.com/sovereignCloudStack/cluster-stack-provider-openstack/internal/test/helpers" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/internal/test/integration/openstack/controller_test.go b/internal/test/integration/openstack/controller_test.go index b884e918..dd152293 100644 --- a/internal/test/integration/openstack/controller_test.go +++ b/internal/test/integration/openstack/controller_test.go @@ -21,9 +21,9 @@ import ( "os" "github.com/SovereignCloudStack/cluster-stack-operator/pkg/test/utils" + cspov1alpha1 "github.com/SovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - cspov1alpha1 "github.com/sovereignCloudStack/cluster-stack-provider-openstack/api/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" From 28097668695a80bb5c20d2dfaeac2299eddb5e3e Mon Sep 17 00:00:00 2001 From: Michal Gubricky Date: Thu, 18 Apr 2024 08:18:58 +0200 Subject: [PATCH 2/3] Update hack/version.sh Co-authored-by: Roman Hros Signed-off-by: Michal Gubricky --- hack/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/version.sh b/hack/version.sh index d5a20969..53f6f357 100755 --- a/hack/version.sh +++ b/hack/version.sh @@ -77,7 +77,7 @@ version::ldflags() { local key=${1} local val=${2} ldflags+=( - "-X 'github.com/SovereignCloudStack/cluster-stack-provider-openstack/pkg/csoversion.${key}=${val}'" + "-X 'github.com/SovereignCloudStack/cluster-stack-provider-openstack/pkg/cspoversion.${key}=${val}'" ) } From a81f5363d7c30637912fbd00b7a1ed2f95c58626 Mon Sep 17 00:00:00 2001 From: "michal.gubricky" Date: Thu, 18 Apr 2024 08:46:55 +0200 Subject: [PATCH 3/3] Rename csmctl to csctl Signed-off-by: michal.gubricky --- docs/develop.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/develop.md b/docs/develop.md index 56b4c320..e3c6d0ef 100644 --- a/docs/develop.md +++ b/docs/develop.md @@ -28,8 +28,8 @@ You should make sure that everything in the UI looks green. If not, you can trig ### Applying ClusterStack -When you start your tilt setup then the ClusterStack manifest gets copied from `config/cspo` directory to root of your repository. In order to apply the ClusterStack to the running local development cluster, you can click on the tilt UI. There should a click on the top-right hand side that is named as `apply-clusterstack` if you hover over it. -Once the ClusterStack is applied wait for the ClusterStack and ClusterStackRelease object to be ready. In case your ClusterStack shows that it is ready, you can deploy a workload cluster. +When you start your tilt setup then the ClusterStack manifest gets copied from `config/cspo` directory to root of your repository. In order to apply the ClusterStack to the running local development cluster, you can click on the tilt UI. There should a click on the top-right hand side that is named as `apply-clusterstack` if you hover over it. +Once the ClusterStack is applied wait for the ClusterStack and ClusterStackRelease object to be ready. In case your ClusterStack shows that it is ready, you can deploy a workload cluster. ### Creating workload cluster @@ -102,6 +102,6 @@ $ tree .release/openstack-scs-1-27-v1/ ``` > [!IMPORTANT] -There's an alternative way to get clusterstacks using [csmctl](https://github.com/SovereignCloudStack/csmctl). You can follow the README of csmctl for specific instructions and a good quickstart. +There's an alternative way to get clusterstacks using [csctl](https://github.com/SovereignCloudStack/csctl). You can follow the README of csctl for specific instructions and a good quickstart. -You can use `csmctl create` subcommand to create clusterstack locally. You'll need a csmctl.yaml file in the cluster-stack configuration directory. Please read more about creating configuration file for csmctl in the csmctl docs. +You can use `csctl create` subcommand to create clusterstack locally. You'll need a csctl.yaml file in the cluster-stack configuration directory. Please read more about creating configuration file for csctl in the csctl docs.