Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 types_apibinding,types_apiexport: revert applied/export permission claims #2177

Merged
merged 1 commit into from
Oct 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions config/crds/apis.kcp.dev_apibindings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ spec:
records if the user accepts or rejects it.
properties:
group:
default: ""
description: group is the name of an API group. For core groups
this is the empty string '""'.
pattern: ^(|[a-z0-9]([-a-z0-9]*[a-z0-9](\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)?)$
Expand Down Expand Up @@ -126,7 +125,6 @@ spec:
allow the service provider access to.
properties:
group:
default: ""
description: group is the name of an API group. For core groups
this is the empty string '""'.
pattern: ^(|[a-z0-9]([-a-z0-9]*[a-z0-9](\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)?)$
Expand All @@ -148,10 +146,6 @@ spec:
- resource
type: object
type: array
x-kubernetes-list-map-keys:
- group
- resource
x-kubernetes-list-type: map
boundExport:
description: "boundExport records the export this binding is bound
to currently. It can differ from the export that was specified in
Expand Down Expand Up @@ -297,7 +291,6 @@ spec:
allow the service provider access to.
properties:
group:
default: ""
description: group is the name of an API group. For core groups
this is the empty string '""'.
pattern: ^(|[a-z0-9]([-a-z0-9]*[a-z0-9](\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)?)$
Expand All @@ -319,10 +312,6 @@ spec:
- resource
type: object
type: array
x-kubernetes-list-map-keys:
- group
- resource
x-kubernetes-list-type: map
phase:
description: 'phase is the current phase of the APIBinding: - "":
the APIBinding has just been created, waiting to be bound. - Binding:
Expand Down
1 change: 0 additions & 1 deletion config/crds/workload.kcp.dev_synctargets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ spec:
items:
properties:
group:
default: ""
description: group is the name of an API group. For core groups
this is the empty string '""'.
pattern: ^(|[a-z0-9]([-a-z0-9]*[a-z0-9](\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)?)$
Expand Down
2 changes: 1 addition & 1 deletion config/root-phase0/apiexport-workload.kcp.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
name: workload.kcp.dev
spec:
latestResourceSchemas:
- v221011-1af9d713.synctargets.workload.kcp.dev
- v220923-836dfac8.synctargets.workload.kcp.dev
status: {}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apis.kcp.dev/v1alpha1
kind: APIResourceSchema
metadata:
creationTimestamp: null
name: v221011-1af9d713.synctargets.workload.kcp.dev
name: v220923-836dfac8.synctargets.workload.kcp.dev
spec:
group: workload.kcp.dev
names:
Expand Down Expand Up @@ -189,7 +189,6 @@ spec:
items:
properties:
group:
default: ""
description: group is the name of an API group. For core groups
this is the empty string '""'.
pattern: ^(|[a-z0-9]([-a-z0-9]*[a-z0-9](\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)?)$
Expand Down
6 changes: 0 additions & 6 deletions pkg/apis/apis/v1alpha1/types_apibinding.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,11 @@ type APIBindingStatus struct {
// state in spec.permissionClaims.
//
// +optional
// +listType=map
// +listMapKey=group
// +listMapKey=resource
AppliedPermissionClaims []PermissionClaim `json:"appliedPermissionClaims,omitempty"`

// exportPermissionClaims records the permissions that the export provider is asking for
// the binding to grant.
// +optional
// +listType=map
// +listMapKey=group
// +listMapKey=resource
ExportPermissionClaims []PermissionClaim `json:"exportPermissionClaims,omitempty"`
}

Expand Down
1 change: 0 additions & 1 deletion pkg/apis/apis/v1alpha1/types_apiexport.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ type GroupResource struct {
//
// +kubebuilder:validation:Pattern=`^(|[a-z0-9]([-a-z0-9]*[a-z0-9](\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)?)$`
// +optional
// +kubebuilder:default=""
Group string `json:"group,omitempty"`

// resource is the name of the resource.
Expand Down
18 changes: 0 additions & 18 deletions pkg/openapi/zz_generated.openapi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.