Rename

saagie · Nov 21, 2023 · a29ee7f · a29ee7f
1 parent 8399a94
commit a29ee7f
Show file tree

Hide file tree

Showing 30 changed files with 94 additions and 65 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -38,7 +38,7 @@ linters-settings:
  goimports:
  # put imports beginning with prefix after 3rd-party packages;
  # it's a comma-separated list of prefixes
- local-prefixes: github.com/saagie/upjet-provider-ovh
+ local-prefixes: saagie.io/provider-ovh
 
  gocyclo:
  # minimal code complexity to report, 30 by default (but we recommend 10-20)

diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 # ====================================================================================
 # Setup Project
 
-PROJECT_NAME ?= upjet-provider-ovh
-PROJECT_REPO ?= github.com/saagie/$(PROJECT_NAME)
+PROJECT_NAME ?= provider-ovh
+PROJECT_REPO ?= saagie.io/$(PROJECT_NAME)
 
 export TERRAFORM_VERSION ?= 1.2.1
 
@@ -88,7 +88,7 @@ fallthrough: submodules
 
 # NOTE(hasheddan): we force image building to happen prior to xpkg build so that
 # we ensure image is present in daemon.
-xpkg.build.upjet-provider-template: do.build.images
+xpkg.build.provider-ovh: do.build.images
 
 # NOTE(hasheddan): we ensure up is installed prior to running platform-specific
 # build steps in parallel to avoid encountering an installation race condition.

diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@ Ovh API.
 ## Getting Started
 
 Install the provider by using the following command after changing the image tag
-to the [latest release](https://marketplace.upbound.io/providers/upjet-provider-ovh):
+to the [latest release](https://marketplace.upbound.io/providers/provider-ovh):
 ```
-up ctp provider install upjet-provider-ovh:v0.1.0
+up ctp provider install provider-ovh:v0.1.0
 ```
 
 Alternatively, you can use declarative installation:
@@ -21,13 +21,13 @@ kind: Provider
 metadata:
  name: provider-ovh
 spec:
- package: upjet-provider-ovh:v0.1.0
+ package: provider-ovh:v0.1.0
 EOF
 ```
 
 Notice that in this example Provider resource is referencing ControllerConfig with debug enabled.
 
-You can see the API reference [here](https://doc.crds.dev/github.com/saagie/upjet-provider-ovh).
+You can see the API reference [here](https://doc.crds.dev/saagie.io/provider-ovh).
 
 ## Developing
 
@@ -57,4 +57,4 @@ make build
 ## Report a Bug
 
 For filing bugs, suggesting improvements, or requesting new features, please
-open an [issue](https://github.com/saagie/upjet-provider-ovh/issues).
+open an [issue](https://saagie.io/provider-ovh/issues).
diff --git a/apis/kube/v1alpha1/zz_iprestrictions_types.go b/apis/kube/v1alpha1/zz_iprestrictions_types.go
diff --git a/apis/kube/v1alpha1/zz_nodepool_types.go b/apis/kube/v1alpha1/zz_nodepool_types.go
diff --git a/apis/user/v1alpha1/zz_s3credentials_types.go b/apis/user/v1alpha1/zz_s3credentials_types.go
diff --git a/apis/user/v1alpha1/zz_s3policy_types.go b/apis/user/v1alpha1/zz_s3policy_types.go
diff --git a/apis/zz_register.go b/apis/zz_register.go
diff --git a/cluster/images/upjet-provider-ovh/Dockerfile → cluster/images/provider-ovh/Dockerfile b/cluster/images/upjet-provider-ovh/Dockerfile → cluster/images/provider-ovh/Dockerfile
diff --git a/cluster/images/upjet-provider-ovh/Makefile → cluster/images/provider-ovh/Makefile b/cluster/images/upjet-provider-ovh/Makefile → cluster/images/provider-ovh/Makefile
diff --git a/...images/upjet-provider-ovh/terraformrc.hcl → cluster/images/provider-ovh/terraformrc.hcl b/...images/upjet-provider-ovh/terraformrc.hcl → cluster/images/provider-ovh/terraformrc.hcl
diff --git a/cmd/generator/main.go b/cmd/generator/main.go
@@ -11,7 +11,7 @@ import (
 
  "github.com/crossplane/upjet/pkg/pipeline"
 
- "github.com/saagie/upjet-provider-ovh/config"
+ "saagie.io/provider-ovh/config"
 )
 
 func main() {

diff --git a/cmd/provider/main.go b/cmd/provider/main.go
@@ -26,12 +26,12 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/cache"
  "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
- "github.com/saagie/upjet-provider-ovh/apis"
- "github.com/saagie/upjet-provider-ovh/apis/v1alpha1"
- "github.com/saagie/upjet-provider-ovh/config"
- "github.com/saagie/upjet-provider-ovh/internal/clients"
- "github.com/saagie/upjet-provider-ovh/internal/controller"
- "github.com/saagie/upjet-provider-ovh/internal/features"
+ "saagie.io/provider-ovh/apis"
+ "saagie.io/provider-ovh/apis/v1alpha1"
+ "saagie.io/provider-ovh/config"
+ "saagie.io/provider-ovh/internal/clients"
+ "saagie.io/provider-ovh/internal/controller"
+ "saagie.io/provider-ovh/internal/features"
 )
 
 func main() {
@@ -55,7 +55,7 @@ func main() {
  kingpin.MustParse(app.Parse(os.Args[1:]))
 
  zl := zap.New(zap.UseDevMode(*debug))
- log := logging.NewLogrLogger(zl.WithName("upjet-provider-template"))
+ log := logging.NewLogrLogger(zl.WithName("provider-ovh"))
  if *debug {
  // The controller-runtime runs with a no-op logger by default. It is
  // *very* verbose even at info level, so we only provide it a real
@@ -70,7 +70,7 @@ func main() {
 
  mgr, err := ctrl.NewManager(cfg, ctrl.Options{
  LeaderElection: *leaderElection,
- LeaderElectionID: "crossplane-leader-election-upjet-provider-template",
+ LeaderElectionID: "crossplane-leader-election-provider-ovh",
  Cache: cache.Options{
  SyncPeriod: syncPeriod,
  },

diff --git a/config/kube/config.go b/config/kube/config.go
@@ -14,7 +14,7 @@ func Configure(p *config.Provider) {
  })
  p.AddResourceConfigurator("ovh_cloud_project_kube_nodepool", func(r *config.Resource) {
  r.References["kube_id"] = config.Reference{
- Type: "github.com/saagie/upjet-provider-ovh/apis/kube/v1alpha1.Kube",
+ Type: "saagie.io/provider-ovh/apis/kube/v1alpha1.Kube",
  }
  r.UseAsync = true
 
@@ -23,7 +23,7 @@ func Configure(p *config.Provider) {
  })
  p.AddResourceConfigurator("ovh_cloud_project_kube_iprestrictions", func(r *config.Resource) {
  r.References["kube_id"] = config.Reference{
- Type: "github.com/saagie/upjet-provider-ovh/apis/kube/v1alpha1.Kube",
+ Type: "saagie.io/provider-ovh/apis/kube/v1alpha1.Kube",
  }
 
  r.ShortGroup = "kube.cloud"

diff --git a/config/provider.go b/config/provider.go
@@ -10,14 +10,14 @@ import (
 
  ujconfig "github.com/crossplane/upjet/pkg/config"
 
- "github.com/saagie/upjet-provider-ovh/config/database"
- "github.com/saagie/upjet-provider-ovh/config/kube"
- "github.com/saagie/upjet-provider-ovh/config/user"
+ "saagie.io/provider-ovh/config/database"
+ "saagie.io/provider-ovh/config/kube"
+ "saagie.io/provider-ovh/config/user"
 )
 
 const (
  resourcePrefix = "ovh"
- modulePath = "github.com/saagie/upjet-provider-ovh"
+ modulePath = "saagie.io/provider-ovh"
 )
 
 //go:embed schema.json

diff --git a/config/user/config.go b/config/user/config.go
@@ -12,14 +12,14 @@ func Configure(p *config.Provider) {
  })
  p.AddResourceConfigurator("ovh_cloud_project_user_s3_policy", func(r *config.Resource) {
  r.References["user_id"] = config.Reference{
- Type: "github.com/saagie/upjet-provider-ovh/apis/user/v1alpha1.User",
+ Type: "saagie.io/provider-ovh/apis/user/v1alpha1.User",
  }
  r.ShortGroup = "user.cloud"
  r.Kind = "S3Policy"
  })
  p.AddResourceConfigurator("ovh_cloud_project_user_s3_credential", func(r *config.Resource) {
  r.References["user_id"] = config.Reference{
- Type: "github.com/saagie/upjet-provider-ovh/apis/user/v1alpha1.User",
+ Type: "saagie.io/provider-ovh/apis/user/v1alpha1.User",
  }
  r.ShortGroup = "user.cloud"
  r.Kind = "S3Credentials"

diff --git a/examples/install.yaml b/examples/install.yaml
@@ -3,4 +3,4 @@ kind: Provider
 metadata:
  name: provider-ovh
 spec:
- package: saagie/upjet-provider-ovh:v0.1.0
+ package: saagie/provider-ovh:v0.1.0
diff --git a/examples/kubernetes/kubernetes_observ.yaml b/examples/kubernetes/kubernetes_observ.yaml
@@ -4,15 +4,44 @@ kind: Kube
 metadata:
  name: dev
  annotations:
- "crossplane.io/external-name": "607a2c62-dfdd-4a96-907b-a15fc123e791"
+ "crossplane.io/external-name": "c8759abc-7aa0-413c-b89f-3da583f0ce91"
 spec:
  managementPolicies:
  - Observe
  providerConfigRef:
- name: ovh-provider-config
+ name: default
  forProvider:
  name: "dev"
  serviceName: 7485b2ac7d67456a888409f0e882e7eb
  writeConnectionSecretToRef:
  name: kubeconfig
- namespace: default
+ namespace: default
+---
+apiVersion: kube.cloud.ovh.saagie.io/v1alpha1
+kind: NodePool
+metadata:
+ name: dev
+ annotations:
+ "crossplane.io/external-name": "047da6ee-f1dc-412b-9451-0b064847ed97"
+spec:
+ managementPolicies:
+ - Observe
+ forProvider:
+ name: "dev"
+ kubeIdRef:
+ name: dev
+ serviceName: 7485b2ac7d67456a888409f0e882e7eb
+---
+apiVersion: kube.cloud.ovh.saagie.io/v1alpha1
+kind: IpRestrictions
+metadata:
+ name: dev
+ annotations:
+ "crossplane.io/external-name": "c8759abc-7aa0-413c-b89f-3da583f0ce91"
+spec:
+ managementPolicies:
+ - Observe
+ forProvider:
+ kubeIdRef:
+ name: dev
+ serviceName: 7485b2ac7d67456a888409f0e882e7eb
diff --git a/examples/providerconfig/providerconfig.yaml b/examples/providerconfig/providerconfig.yaml
@@ -6,6 +6,6 @@ spec:
  credentials:
  source: Secret
  secretRef:
- name: example-creds
+ name: example-creds-ovh
  namespace: crossplane-system
  key: credentials
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/saagie/upjet-provider-ovh
+module saagie.io/provider-ovh
 
 go 1.19
 

diff --git a/internal/clients/ovh.go b/internal/clients/ovh.go
@@ -15,7 +15,7 @@ import (
 
  "github.com/crossplane/upjet/pkg/terraform"
 
- "github.com/saagie/upjet-provider-ovh/apis/v1beta1"
+ "saagie.io/provider-ovh/apis/v1beta1"
 )
 
 const (

diff --git a/internal/controller/database/database/zz_controller.go b/internal/controller/database/database/zz_controller.go
diff --git a/internal/controller/kube/iprestrictions/zz_controller.go b/internal/controller/kube/iprestrictions/zz_controller.go
diff --git a/internal/controller/kube/kube/zz_controller.go b/internal/controller/kube/kube/zz_controller.go
diff --git a/internal/controller/kube/nodepool/zz_controller.go b/internal/controller/kube/nodepool/zz_controller.go
diff --git a/internal/controller/providerconfig/config.go b/internal/controller/providerconfig/config.go
@@ -11,7 +11,7 @@ import (
  "github.com/crossplane/upjet/pkg/controller"
  ctrl "sigs.k8s.io/controller-runtime"
 
- "github.com/saagie/upjet-provider-ovh/apis/v1beta1"
+ "saagie.io/provider-ovh/apis/v1beta1"
 )
 
 // Setup adds a controller that reconciles ProviderConfigs by accounting for

diff --git a/internal/controller/user/s3credentials/zz_controller.go b/internal/controller/user/s3credentials/zz_controller.go
diff --git a/internal/controller/user/s3policy/zz_controller.go b/internal/controller/user/s3policy/zz_controller.go
diff --git a/internal/controller/user/user/zz_controller.go b/internal/controller/user/user/zz_controller.go