Skip to content

Commit 3d404d1

Browse files
Upgrade to Crossplane v2 (#83)
Signed-off-by: Mert Luleci <mert.luleci@bp.com> Signed-off-by: Jesús Fernández <7312236+fernandezcuesta@users.noreply.github.com> Co-authored-by: Jesús Fernández <7312236+fernandezcuesta@users.noreply.github.com>
1 parent 87953ea commit 3d404d1

90 files changed

Lines changed: 4157 additions & 763 deletions

File tree

Some content is hidden

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

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "build"]
22
path = build
3-
url = https://github.com/upbound/build
3+
url = https://github.com/crossplane/build
File renamed without changes.
Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,13 @@ package v1alpha1
1919
import (
2020
"reflect"
2121

22+
xpv1 "github.com/crossplane/crossplane-runtime/v2/apis/common/v1"
2223
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2324
"k8s.io/apimachinery/pkg/runtime/schema"
2425

25-
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
26+
common "github.com/crossplane-contrib/provider-kafka/apis/v1alpha1"
2627
)
2728

28-
// AccessControlListParameters are the configurable fields of a AccessControlList.
29-
type AccessControlListParameters struct {
30-
// ResourceName is the name of the resource.
31-
ResourceName string `json:"resourceName"`
32-
// ResourceType is the type of resource.
33-
// Valid values are Unknown, Any, Topic, Group, Cluster, TransactionalID
34-
// +kubebuilder:validation:Enum=Unknown;Any;Topic;Group;Cluster;TransactionalID
35-
ResourceType string `json:"resourceType"`
36-
// ResourcePrincipal is the Principal that is being allowed or denied.
37-
ResourcePrincipal string `json:"resourcePrincipal"`
38-
// ResourceHost is the Host from which principal listed in ResourcePrinciple will have access.
39-
ResourceHost string `json:"resourceHost"`
40-
// ResourceOperation is the Operation that is being allowed or denied.
41-
// Valid values are Unknown, Any, All, Read, Write, Create, Delete, Alter, Describe, ClusterAction, DescribeConfigs, AlterConfigs, IdempotentWrite.
42-
// +kubebuilder:validation:Enum=Unknown;Any;All;Read;Write;Create;Delete;Alter;Describe;ClusterAction;DescribeConfigs;AlterConfigs;IdempotentWrite
43-
ResourceOperation string `json:"resourceOperation"`
44-
// ResourcePermissionType is the Type of permission.
45-
// Valid values are Unknown, Any, Allow, Deny.
46-
// +kubebuilder:validation:Enum=Unknown;Any;Allow;Deny
47-
ResourcePermissionType string `json:"resourcePermissionType"`
48-
// ResourcePatternTypeFilter is the pattern filter.
49-
// Valid values are Prefixed, Any, Match, Literal.
50-
// +kubebuilder:validation:Enum=Prefixed;Any;Match;Literal
51-
ResourcePatternTypeFilter string `json:"resourcePatternTypeFilter"`
52-
}
53-
5429
// AccessControlListObservation are the observable fields of an AccessControlList
5530
type AccessControlListObservation struct {
5631
ID string `json:"id,omitempty"`
@@ -59,7 +34,7 @@ type AccessControlListObservation struct {
5934
// An AccessControlListSpec defines the desired state of an AccessControlList
6035
type AccessControlListSpec struct {
6136
xpv1.ResourceSpec `json:",inline"`
62-
ForProvider AccessControlListParameters `json:"forProvider"`
37+
ForProvider common.AccessControlListParameters `json:"forProvider"`
6338
}
6439

6540
// A AccessControlListStatus represents the observed state of a AccessControlList.

apis/acl/v1alpha1/groupversion_info.go renamed to apis/cluster/acl/v1alpha1/groupversion_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package v1alpha1 contains the v1alpha1 group Sample resources of the Template provider.
17+
// Package v1alpha1 contains the v1alpha1 group Sample resources of the Kafka provider.
1818
// +kubebuilder:object:generate=true
1919
// +groupName=acl.kafka.crossplane.io
2020
// +versionName=v1alpha1

apis/acl/v1alpha1/zz_generated.deepcopy.go renamed to apis/cluster/acl/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/acl/v1alpha1/zz_generated.managed.go renamed to apis/cluster/acl/v1alpha1/zz_generated.managed.go

Lines changed: 1 addition & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/acl/v1alpha1/zz_generated.managedlist.go renamed to apis/cluster/acl/v1alpha1/zz_generated.managedlist.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/kafka.go renamed to apis/cluster/kafka.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ package apis
2020
import (
2121
"k8s.io/apimachinery/pkg/runtime"
2222

23-
aclv1alpha1 "github.com/crossplane-contrib/provider-kafka/apis/acl/v1alpha1"
24-
topicv1alpha1 "github.com/crossplane-contrib/provider-kafka/apis/topic/v1alpha1"
25-
kafkav1alpha1 "github.com/crossplane-contrib/provider-kafka/apis/v1alpha1"
23+
aclv1alpha1 "github.com/crossplane-contrib/provider-kafka/apis/cluster/acl/v1alpha1"
24+
topicv1alpha1 "github.com/crossplane-contrib/provider-kafka/apis/cluster/topic/v1alpha1"
25+
kafkav1alpha1 "github.com/crossplane-contrib/provider-kafka/apis/cluster/v1alpha1"
2626
)
2727

2828
func init() {

0 commit comments

Comments
 (0)