Skip to content

Commit 590f0ce

Browse files
tamalsahatamalsaha
committed
Fix patching
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent aa25f8b commit 590f0ce

File tree

759 files changed

+1375
-1305
lines changed

Some content is hidden

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

759 files changed

+1375
-1305
lines changed

‎crds/profile.k8s.appscode.com_managedclusterprofilebindings.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ spec:
4646
- capa
4747
- capg
4848
- capz
49+
- caph
50+
- capk
4951
type: string
5052
required:
5153
- clusterName

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/fluxcd/source-controller/api v1.3.0
1010
github.com/google/gofuzz v1.2.0
1111
github.com/spf13/cobra v1.8.1
12-
go.bytebuilders.dev/license-verifier v0.14.2
12+
go.bytebuilders.dev/license-verifier v0.14.4
1313
gomodules.xyz/logs v0.0.7
1414
gomodules.xyz/x v0.0.17
1515
helm.sh/helm/v3 v3.15.0
@@ -22,9 +22,9 @@ require (
2222
k8s.io/kube-openapi v0.0.0-20240726031636-6f6746feab9c
2323
k8s.io/kubectl v0.30.1
2424
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
25-
kmodules.xyz/client-go v0.30.42
25+
kmodules.xyz/client-go v0.30.44
2626
kmodules.xyz/fake-apiserver v0.0.4
27-
kmodules.xyz/resource-metadata v0.23.3
27+
kmodules.xyz/resource-metadata v0.24.2
2828
kubepack.dev/lib-app v0.1.0
2929
kubepack.dev/lib-helm v0.29.13
3030
open-cluster-management.io/api v0.14.0

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
694694
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
695695
github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
696696
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
697-
go.bytebuilders.dev/license-verifier v0.14.2 h1:syPjdKV9YC9ERpm4vofpHf7coZtntqbSXweN0XFQJBQ=
698-
go.bytebuilders.dev/license-verifier v0.14.2/go.mod h1:bNNaVbry3TZbu54pf57LkhjsFX94T6O62w0roiy1yiE=
697+
go.bytebuilders.dev/license-verifier v0.14.4 h1:JwTGQFew4nudwv8Pk3BdfQRts8KfgUQ5xhu138w1wt4=
698+
go.bytebuilders.dev/license-verifier v0.14.4/go.mod h1:LqWXJKee5ofDcCYM6T5WilYlUc4NlKeZz58tHwO8GEs=
699699
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
700700
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
701701
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -1056,16 +1056,16 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
10561056
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
10571057
kmodules.xyz/apply v0.29.0 h1:0OXGfE2IPuvXHk6uI9zp6KCYdBibx8mK4PEl0g3LZ44=
10581058
kmodules.xyz/apply v0.29.0/go.mod h1:bwToXErB+DC7/EEWjQVARCSbJBjGx5hIEuV1n0tC73g=
1059-
kmodules.xyz/client-go v0.30.42 h1:79x66I8betRJtmFzKS46ujXzXVKAxpXNsm32ayNxTEA=
1060-
kmodules.xyz/client-go v0.30.42/go.mod h1:ZOxyEdoSZByjZLkzSM3Q8p1zXMayflK7jQQnWMG2Yj8=
1059+
kmodules.xyz/client-go v0.30.44 h1:mLOBXQhvCIhdega9WoN4Px/usqobuKTT2vOPQcbGhXQ=
1060+
kmodules.xyz/client-go v0.30.44/go.mod h1:T9Kiu20wXEn65dLBQeegf4+y7oahJBR9ZJO2zGEVLIY=
10611061
kmodules.xyz/fake-apiserver v0.0.4 h1:yegZJ0w/rn/gG/QAPiXaEgwOc7h+svFGm1Hwdu7+zw8=
10621062
kmodules.xyz/fake-apiserver v0.0.4/go.mod h1:roaYuCY02IfuO5adpbEZf3z/JSMOIrpUOWhHglFM2kY=
10631063
kmodules.xyz/go-containerregistry v0.0.12 h1:Tl32QGmSqRVm9PUEb/f3dgDeu9zW5fVzt3qmAFIE37I=
10641064
kmodules.xyz/go-containerregistry v0.0.12/go.mod h1:KgeNg0hDsgeda+qc0NzWk0iVRdF0+ZIg/oRzGoYh78I=
10651065
kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
10661066
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
1067-
kmodules.xyz/resource-metadata v0.23.3 h1:00te7JVn/SjuufAXG4l/T3oItJASpJmgHYGGdXjvEC4=
1068-
kmodules.xyz/resource-metadata v0.23.3/go.mod h1:k7oxVO2BbgXOXfPrf6v8uAki52MLQ01mo4g0PcEyebM=
1067+
kmodules.xyz/resource-metadata v0.24.2 h1:PBVfWCVzjlG5LaxKO3YhfLpgLQctXDFG/pYpnznjWbE=
1068+
kmodules.xyz/resource-metadata v0.24.2/go.mod h1:rPUZSMR0e1Vi+gONQ2ZhOFW+GvUeK+1AI7h9fzTZoKI=
10691069
kmodules.xyz/resource-metrics v0.30.5 h1:ZhpGeR9DCz1HTrKUg/mWhr95wlFzCPRdgVAqwaggy1o=
10701070
kmodules.xyz/resource-metrics v0.30.5/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ=
10711071
kubepack.dev/kubepack v0.29.2-0.20240914155715-3a591859b705 h1:fFn0CdYpDKTUFA4t6AV9DSVJLMwLZy8Q6RKPhNgLO+g=

‎vendor/kmodules.xyz/client-go/api/v1/cluster.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,15 @@ type ClusterInfo struct {
192192
CAPI *CAPIClusterInfo `json:"capi" protobuf:"bytes,4,opt,name=capi"`
193193
}
194194

195-
// +kubebuilder:validation:Enum=capa;capg;capz
195+
// +kubebuilder:validation:Enum=capa;capg;capz;caph;capk
196196
type CAPIProvider string
197197

198198
const (
199199
CAPIProviderCAPA CAPIProvider = "capa"
200200
CAPIProviderCAPG CAPIProvider = "capg"
201201
CAPIProviderCAPZ CAPIProvider = "capz"
202202
CAPIProviderCAPH CAPIProvider = "caph"
203+
CAPIProviderCAPK CAPIProvider = "capk"
203204
)
204205

205206
type ClusterClaimInfo struct {

‎vendor/kmodules.xyz/client-go/api/v1/object.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828
)
2929

30-
// TypedObjectReference represents an typed namespaced object.
30+
// TypeReference represents an object type.
31+
type TypeReference struct {
32+
APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"`
33+
Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"`
34+
}
35+
36+
// TypedObjectReference represents a typed namespaced object.
3137
type TypedObjectReference struct {
3238
APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"`
3339
Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"`

‎vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go‎

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

‎vendor/kmodules.xyz/client-go/client/client.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ func CreateOrPatchE(ctx context.Context, c client.Client, obj client.Object, tra
143143

144144
func CreateOrPatch(ctx context.Context, c client.Client, obj client.Object, transform TransformFunc, opts ...client.PatchOption) (kutil.VerbType, error) {
145145
return CreateOrPatchE(ctx, c, obj, func(obj client.Object, createOp bool) (client.Object, error) {
146-
transform(obj, createOp)
147-
return obj, nil
146+
return transform(obj, createOp), nil
148147
}, opts...)
149148
}
150149

@@ -188,8 +187,7 @@ func PatchE(ctx context.Context, c client.Client, obj client.Object, transform P
188187

189188
func Patch(ctx context.Context, c client.Client, obj client.Object, transform PatchFunc, opts ...client.PatchOption) (kutil.VerbType, error) {
190189
return PatchE(ctx, c, obj, func(obj client.Object) (client.Object, error) {
191-
transform(obj)
192-
return obj, nil
190+
return transform(obj), nil
193191
}, opts...)
194192
}
195193

@@ -232,8 +230,7 @@ func PatchStatusE(ctx context.Context, c client.Client, obj client.Object, trans
232230

233231
func PatchStatus(ctx context.Context, c client.Client, obj client.Object, transform PatchFunc, opts ...client.SubResourcePatchOption) (kutil.VerbType, error) {
234232
return PatchStatusE(ctx, c, obj, func(obj client.Object) (client.Object, error) {
235-
transform(obj)
236-
return obj, nil
233+
return transform(obj), nil
237234
}, opts...)
238235
}
239236

‎vendor/kmodules.xyz/client-go/cluster/lib.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ func getProviderName(kind string) kmapi.CAPIProvider {
222222
return kmapi.CAPIProviderCAPG
223223
case "HetznerCluster":
224224
return kmapi.CAPIProviderCAPH
225+
case "KubevirtCluster":
226+
return kmapi.CAPIProviderCAPK
225227
}
226228
return ""
227229
}

‎vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go‎

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

‎vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourcelayout_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ type PageBlockLayout struct {
8484
View *PageBlockTableDefinition `json:"view,omitempty"`
8585

8686
RequiredFeatureSets map[string]FeatureList `json:"requiredFeatureSets,omitempty"`
87+
Filters map[string]bool `json:"filters,omitempty"`
8788
}
8889

8990
type FeatureList []string

0 commit comments

Comments
 (0)