Skip to content

Commit 8bb3076

Browse files
committed
Change package name to something resolvable
From: cloud.redhat.com/clowder/v2 To: github.com/RedHatInsights/clowder While we could get the actual URL to resolve, all our stuff is moving to console.redhat.come. Also, it would require dev work that is not very valuable. We are dropping the v2 because we don't need to use go modules to track different versions of our package since k8s APIs handle that for us.
1 parent 5704c87 commit 8bb3076

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+337
-335
lines changed

PROJECT

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins:
66
manifests.sdk.operatorframework.io/v2: {}
77
scorecard.sdk.operatorframework.io/v2: {}
88
projectName: clowder
9-
repo: cloud.redhat.com/clowder/v2
9+
repo: github.com/RedHatInsights/clowder
1010
resources:
1111
- api:
1212
crdVersion: v1
@@ -15,7 +15,7 @@ resources:
1515
domain: cloud.redhat.com
1616
group: cloud.redhat.com
1717
kind: ClowdEnvironment
18-
path: cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1
18+
path: github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1
1919
version: v1alpha1
2020
- api:
2121
crdVersion: v1
@@ -24,7 +24,7 @@ resources:
2424
domain: cloud.redhat.com
2525
group: cloud.redhat.com
2626
kind: ClowdJobInvocation
27-
path: cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1
27+
path: github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1
2828
version: v1alpha1
2929
- api:
3030
crdVersion: v1
@@ -33,7 +33,7 @@ resources:
3333
domain: cloud.redhat.com
3434
group: cloud.redhat.com
3535
kind: ClowdApp
36-
path: cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1
36+
path: github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1
3737
version: v1alpha1
3838
webhooks:
3939
validation: true

apis/cloud.redhat.com/v1alpha1/clowdapp_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"errors"
1818
"fmt"
1919

20-
"cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1/common"
20+
"github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1/common"
2121
strimzi "github.com/RedHatInsights/strimzi-client-go/apis/kafka.strimzi.io/v1beta1"
2222
batch "k8s.io/api/batch/v1beta1"
2323
v1 "k8s.io/api/core/v1"

apis/cloud.redhat.com/v1alpha1/clowdenvironment_types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"fmt"
2020
"strings"
2121

22-
"cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1/common"
23-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/errors"
24-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/utils"
22+
"github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1/common"
23+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
24+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/utils"
2525
strimzi "github.com/RedHatInsights/strimzi-client-go/apis/kafka.strimzi.io/v1beta1"
2626

2727
core "k8s.io/api/core/v1"

apis/cloud.redhat.com/v1alpha1/clowdjobinvocation_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1alpha1
1919
import (
2020
"fmt"
2121

22-
"cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1/common"
22+
"github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1/common"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/types"
2525
)

config/crd/bases/cloud.redhat.com_clowdapps.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2387,17 +2387,18 @@ spec:
23872387
jobs:
23882388
description: A list of jobs
23892389
items:
2390-
description: Job defines a CronJob as Schedule is required. In the
2391-
future omitting the Schedule field will allow support for a standard
2392-
Job resource.
2390+
description: Job defines a ClowdJob A Job struct will deploy as
2391+
a CronJob if `schedule` is set and will deploy as a Job if it
2392+
is not set. Unsupported fields will be dropped from Jobs
23932393
properties:
23942394
concurrencyPolicy:
23952395
description: Defines the concurrency policy for the CronJob,
2396-
defaults to Allow
2396+
defaults to Allow Only applies to Cronjobs
23972397
type: string
23982398
failedJobsHistoryLimit:
23992399
description: The number of failed finished jobs to retain. Value
2400-
must be non-negative integer. Defaults to 1.
2400+
must be non-negative integer. Defaults to 1. Only applies
2401+
to Cronjobs
24012402
format: int32
24022403
type: integer
24032404
name:
@@ -4615,13 +4616,14 @@ spec:
46154616
type: integer
46164617
successfulJobsHistoryLimit:
46174618
description: The number of successful finished jobs to retain.
4618-
Value must be non-negative integer. Defaults to 3.
4619+
Value must be non-negative integer. Defaults to 3. Only applies
4620+
to Cronjobs
46194621
format: int32
46204622
type: integer
46214623
suspend:
46224624
description: This flag tells the controller to suspend subsequent
46234625
executions, it does not apply to already started executions. Defaults
4624-
to false.
4626+
to false. Only applies to Cronjobs
46254627
type: boolean
46264628
required:
46274629
- name

controllers/cloud.redhat.com/clowdapp_controller.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,33 @@ import (
4444
"sigs.k8s.io/controller-runtime/pkg/source"
4545

4646
// Import the providers to initialize them
47-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/clowder_config"
48-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/config"
49-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers"
47+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/clowder_config"
48+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/config"
49+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
5050

5151
// These imports are to register the providers with the provider registration system
52-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/confighash"
53-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/cronjob"
54-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/database"
55-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/dependencies"
56-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/deployment"
57-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/featureflags"
58-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/inmemorydb"
59-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/iqe"
60-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/kafka"
61-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/logging"
62-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/metrics"
63-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/namespace"
64-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/objectstore"
65-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/pullsecrets"
66-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/serviceaccount"
67-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/servicemesh"
68-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/sidecar"
69-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/web"
70-
71-
crd "cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1"
72-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/errors"
73-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/utils"
52+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/confighash"
53+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/cronjob"
54+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/database"
55+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/dependencies"
56+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/deployment"
57+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/featureflags"
58+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/inmemorydb"
59+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/iqe"
60+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/kafka"
61+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/logging"
62+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/metrics"
63+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/namespace"
64+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/objectstore"
65+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/pullsecrets"
66+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/serviceaccount"
67+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/servicemesh"
68+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/sidecar"
69+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/web"
70+
71+
crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
72+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
73+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/utils"
7474

7575
"github.com/RedHatInsights/go-difflib/difflib"
7676
)

controllers/cloud.redhat.com/clowdenvironment_controller.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,30 @@ import (
3434
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3535

3636
// Import the providers to initialize them
37-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/confighash"
38-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/cronjob"
39-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/database"
40-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/dependencies"
41-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/deployment"
42-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/featureflags"
43-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/inmemorydb"
44-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/iqe"
45-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/kafka"
46-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/logging"
47-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/metrics"
48-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/namespace"
49-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/objectstore"
50-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/pullsecrets"
51-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/serviceaccount"
52-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/servicemesh"
53-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/sidecar"
54-
_ "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/web"
55-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/utils"
56-
57-
crd "cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1"
58-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/clowder_config"
59-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/errors"
60-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers"
37+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/confighash"
38+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/cronjob"
39+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/database"
40+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/dependencies"
41+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/deployment"
42+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/featureflags"
43+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/inmemorydb"
44+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/iqe"
45+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/kafka"
46+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/logging"
47+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/metrics"
48+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/namespace"
49+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/objectstore"
50+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/pullsecrets"
51+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/serviceaccount"
52+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/servicemesh"
53+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/sidecar"
54+
_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/web"
55+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/utils"
56+
57+
crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
58+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/clowder_config"
59+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
60+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
6161
k8serr "k8s.io/apimachinery/pkg/api/errors"
6262
"sigs.k8s.io/controller-runtime/pkg/handler"
6363
"sigs.k8s.io/controller-runtime/pkg/reconcile"

controllers/cloud.redhat.com/clowdjobinvocation_controller.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222

23-
crd "cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1"
23+
crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
2424
"github.com/go-logr/logr"
2525
batchv1 "k8s.io/api/batch/v1"
2626
core "k8s.io/api/core/v1"
@@ -33,11 +33,11 @@ import (
3333
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3434
"sigs.k8s.io/controller-runtime/pkg/source"
3535

36-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/errors"
37-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/iqe"
38-
jobProvider "cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers/job"
36+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
37+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/iqe"
38+
jobProvider "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/job"
3939

40-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/providers"
40+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
4141

4242
"k8s.io/apimachinery/pkg/types"
4343
"k8s.io/client-go/tools/record"

controllers/cloud.redhat.com/object/object.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package object
22

33
import (
4-
"cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1/common"
4+
"github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1/common"
55
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
66
"k8s.io/apimachinery/pkg/types"
77
)

controllers/cloud.redhat.com/providers/confighash/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"encoding/json"
66
"fmt"
77

8-
crd "cloud.redhat.com/clowder/v2/apis/cloud.redhat.com/v1alpha1"
9-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/config"
10-
"cloud.redhat.com/clowder/v2/controllers/cloud.redhat.com/errors"
8+
crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
9+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/config"
10+
"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
1111
core "k8s.io/api/core/v1"
1212
)
1313

0 commit comments

Comments
 (0)