Skip to content

Commit

Permalink
Fix patching
Browse files Browse the repository at this point in the history 
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
@tamalsaha
tamalsaha committed Jan 8, 2025
1 parent aa25f8b commit 590f0ce
Show file tree
Hide file tree
Showing 759 changed files with 1,375 additions and 1,305 deletions.
2 changes: 2 additions & 0 deletions crds/profile.k8s.appscode.com_managedclusterprofilebindings.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ spec:
- capa
- capg
- capz
- caph
- capk
type: string
required:
- clusterName
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/fluxcd/source-controller/api v1.3.0
github.com/google/gofuzz v1.2.0
github.com/spf13/cobra v1.8.1
go.bytebuilders.dev/license-verifier v0.14.2
go.bytebuilders.dev/license-verifier v0.14.4
gomodules.xyz/logs v0.0.7
gomodules.xyz/x v0.0.17
helm.sh/helm/v3 v3.15.0
Expand All @@ -22,9 +22,9 @@ require (
k8s.io/kube-openapi v0.0.0-20240726031636-6f6746feab9c
k8s.io/kubectl v0.30.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
kmodules.xyz/client-go v0.30.42
kmodules.xyz/client-go v0.30.44
kmodules.xyz/fake-apiserver v0.0.4
kmodules.xyz/resource-metadata v0.23.3
kmodules.xyz/resource-metadata v0.24.2
kubepack.dev/lib-app v0.1.0
kubepack.dev/lib-helm v0.29.13
open-cluster-management.io/api v0.14.0
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,8 +694,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
go.bytebuilders.dev/license-verifier v0.14.2 h1:syPjdKV9YC9ERpm4vofpHf7coZtntqbSXweN0XFQJBQ=
go.bytebuilders.dev/license-verifier v0.14.2/go.mod h1:bNNaVbry3TZbu54pf57LkhjsFX94T6O62w0roiy1yiE=
go.bytebuilders.dev/license-verifier v0.14.4 h1:JwTGQFew4nudwv8Pk3BdfQRts8KfgUQ5xhu138w1wt4=
go.bytebuilders.dev/license-verifier v0.14.4/go.mod h1:LqWXJKee5ofDcCYM6T5WilYlUc4NlKeZz58tHwO8GEs=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
Expand Down Expand Up @@ -1056,16 +1056,16 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
kmodules.xyz/apply v0.29.0 h1:0OXGfE2IPuvXHk6uI9zp6KCYdBibx8mK4PEl0g3LZ44=
kmodules.xyz/apply v0.29.0/go.mod h1:bwToXErB+DC7/EEWjQVARCSbJBjGx5hIEuV1n0tC73g=
kmodules.xyz/client-go v0.30.42 h1:79x66I8betRJtmFzKS46ujXzXVKAxpXNsm32ayNxTEA=
kmodules.xyz/client-go v0.30.42/go.mod h1:ZOxyEdoSZByjZLkzSM3Q8p1zXMayflK7jQQnWMG2Yj8=
kmodules.xyz/client-go v0.30.44 h1:mLOBXQhvCIhdega9WoN4Px/usqobuKTT2vOPQcbGhXQ=
kmodules.xyz/client-go v0.30.44/go.mod h1:T9Kiu20wXEn65dLBQeegf4+y7oahJBR9ZJO2zGEVLIY=
kmodules.xyz/fake-apiserver v0.0.4 h1:yegZJ0w/rn/gG/QAPiXaEgwOc7h+svFGm1Hwdu7+zw8=
kmodules.xyz/fake-apiserver v0.0.4/go.mod h1:roaYuCY02IfuO5adpbEZf3z/JSMOIrpUOWhHglFM2kY=
kmodules.xyz/go-containerregistry v0.0.12 h1:Tl32QGmSqRVm9PUEb/f3dgDeu9zW5fVzt3qmAFIE37I=
kmodules.xyz/go-containerregistry v0.0.12/go.mod h1:KgeNg0hDsgeda+qc0NzWk0iVRdF0+ZIg/oRzGoYh78I=
kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
kmodules.xyz/resource-metadata v0.23.3 h1:00te7JVn/SjuufAXG4l/T3oItJASpJmgHYGGdXjvEC4=
kmodules.xyz/resource-metadata v0.23.3/go.mod h1:k7oxVO2BbgXOXfPrf6v8uAki52MLQ01mo4g0PcEyebM=
kmodules.xyz/resource-metadata v0.24.2 h1:PBVfWCVzjlG5LaxKO3YhfLpgLQctXDFG/pYpnznjWbE=
kmodules.xyz/resource-metadata v0.24.2/go.mod h1:rPUZSMR0e1Vi+gONQ2ZhOFW+GvUeK+1AI7h9fzTZoKI=
kmodules.xyz/resource-metrics v0.30.5 h1:ZhpGeR9DCz1HTrKUg/mWhr95wlFzCPRdgVAqwaggy1o=
kmodules.xyz/resource-metrics v0.30.5/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ=
kubepack.dev/kubepack v0.29.2-0.20240914155715-3a591859b705 h1:fFn0CdYpDKTUFA4t6AV9DSVJLMwLZy8Q6RKPhNgLO+g=
Expand Down
3 changes: 2 additions & 1 deletion vendor/kmodules.xyz/client-go/api/v1/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,15 @@ type ClusterInfo struct {
CAPI *CAPIClusterInfo `json:"capi" protobuf:"bytes,4,opt,name=capi"`
}

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

const (
CAPIProviderCAPA CAPIProvider = "capa"
CAPIProviderCAPG CAPIProvider = "capg"
CAPIProviderCAPZ CAPIProvider = "capz"
CAPIProviderCAPH CAPIProvider = "caph"
CAPIProviderCAPK CAPIProvider = "capk"
)

type ClusterClaimInfo struct {
Expand Down
8 changes: 7 additions & 1 deletion vendor/kmodules.xyz/client-go/api/v1/object.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

// TypedObjectReference represents an typed namespaced object.
// TypeReference represents an object type.
type TypeReference struct {
APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"`
Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"`
}

// TypedObjectReference represents a typed namespaced object.
type TypedObjectReference struct {
APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"`
Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"`
Expand Down
16 changes: 16 additions & 0 deletions vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go
View file

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

9 changes: 3 additions & 6 deletions vendor/kmodules.xyz/client-go/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ func CreateOrPatchE(ctx context.Context, c client.Client, obj client.Object, tra

func CreateOrPatch(ctx context.Context, c client.Client, obj client.Object, transform TransformFunc, opts ...client.PatchOption) (kutil.VerbType, error) {
return CreateOrPatchE(ctx, c, obj, func(obj client.Object, createOp bool) (client.Object, error) {
transform(obj, createOp)
return obj, nil
return transform(obj, createOp), nil
}, opts...)
}

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

func Patch(ctx context.Context, c client.Client, obj client.Object, transform PatchFunc, opts ...client.PatchOption) (kutil.VerbType, error) {
return PatchE(ctx, c, obj, func(obj client.Object) (client.Object, error) {
transform(obj)
return obj, nil
return transform(obj), nil
}, opts...)
}

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

func PatchStatus(ctx context.Context, c client.Client, obj client.Object, transform PatchFunc, opts ...client.SubResourcePatchOption) (kutil.VerbType, error) {
return PatchStatusE(ctx, c, obj, func(obj client.Object) (client.Object, error) {
transform(obj)
return obj, nil
return transform(obj), nil
}, opts...)
}

Expand Down
2 changes: 2 additions & 0 deletions vendor/kmodules.xyz/client-go/cluster/lib.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ func getProviderName(kind string) kmapi.CAPIProvider {
return kmapi.CAPIProviderCAPG
case "HetznerCluster":
return kmapi.CAPIProviderCAPH
case "KubevirtCluster":
return kmapi.CAPIProviderCAPK
}
return ""
}
Expand Down
43 changes: 42 additions & 1 deletion vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go
View file

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

1 change: 1 addition & 0 deletions vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourcelayout_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ type PageBlockLayout struct {
View *PageBlockTableDefinition `json:"view,omitempty"`

RequiredFeatureSets map[string]FeatureList `json:"requiredFeatureSets,omitempty"`
Filters map[string]bool `json:"filters,omitempty"`
}

type FeatureList []string
Expand Down
7 changes: 7 additions & 0 deletions vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/zz_generated.deepcopy.go
View file

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

70 changes: 63 additions & 7 deletions vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go
View file

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

Loading

0 comments on commit 590f0ce

Please sign in to comment.