Skip to content

Commit

Permalink
Introduce ClusterName field to ClusterResourceSetBinding
Browse files Browse the repository at this point in the history
Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
  • Loading branch information
chaunceyjiang committed Dec 4, 2022
1 parent 40b6090 commit 9d29c3f
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 16 deletions.

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

12 changes: 11 additions & 1 deletion exp/addons/api/v1alpha3/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package v1alpha3

import (
apiconversion "k8s.io/apimachinery/pkg/conversion"
"sigs.k8s.io/controller-runtime/pkg/conversion"

addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
Expand Down Expand Up @@ -49,7 +50,11 @@ func (dst *ClusterResourceSetList) ConvertFrom(srcRaw conversion.Hub) error {
func (src *ClusterResourceSetBinding) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetBinding)

return Convert_v1alpha3_ClusterResourceSetBinding_To_v1beta1_ClusterResourceSetBinding(src, dst, nil)
if err := Convert_v1alpha3_ClusterResourceSetBinding_To_v1beta1_ClusterResourceSetBinding(src, dst, nil); err != nil {
return err
}
dst.Spec.ClusterName = src.Name
return nil
}

func (dst *ClusterResourceSetBinding) ConvertFrom(srcRaw conversion.Hub) error {
Expand All @@ -69,3 +74,8 @@ func (dst *ClusterResourceSetBindingList) ConvertFrom(srcRaw conversion.Hub) err

return Convert_v1beta1_ClusterResourceSetBindingList_To_v1alpha3_ClusterResourceSetBindingList(src, dst, nil)
}

// Convert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResourceSetBindingSpec is a conversion function.
func Convert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResourceSetBindingSpec(in *addonsv1.ClusterResourceSetBindingSpec, out *ClusterResourceSetBindingSpec, s apiconversion.Scope) error {
return autoConvert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha3_ClusterResourceSetBindingSpec(in, out, s)
}
30 changes: 23 additions & 7 deletions exp/addons/api/v1alpha3/zz_generated.conversion.go

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

12 changes: 11 additions & 1 deletion exp/addons/api/v1alpha4/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package v1alpha4

import (
apiconversion "k8s.io/apimachinery/pkg/conversion"
"sigs.k8s.io/controller-runtime/pkg/conversion"

addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
Expand Down Expand Up @@ -49,7 +50,11 @@ func (dst *ClusterResourceSetList) ConvertFrom(srcRaw conversion.Hub) error {
func (src *ClusterResourceSetBinding) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*addonsv1.ClusterResourceSetBinding)

return Convert_v1alpha4_ClusterResourceSetBinding_To_v1beta1_ClusterResourceSetBinding(src, dst, nil)
if err := Convert_v1alpha4_ClusterResourceSetBinding_To_v1beta1_ClusterResourceSetBinding(src, dst, nil); err != nil {
return err
}
dst.Spec.ClusterName = src.Name
return nil
}

func (dst *ClusterResourceSetBinding) ConvertFrom(srcRaw conversion.Hub) error {
Expand All @@ -69,3 +74,8 @@ func (dst *ClusterResourceSetBindingList) ConvertFrom(srcRaw conversion.Hub) err

return Convert_v1beta1_ClusterResourceSetBindingList_To_v1alpha4_ClusterResourceSetBindingList(src, dst, nil)
}

// Convert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResourceSetBindingSpec is a conversion function.
func Convert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResourceSetBindingSpec(in *addonsv1.ClusterResourceSetBindingSpec, out *ClusterResourceSetBindingSpec, s apiconversion.Scope) error {
return autoConvert_v1beta1_ClusterResourceSetBindingSpec_To_v1alpha4_ClusterResourceSetBindingSpec(in, out, s)
}
30 changes: 23 additions & 7 deletions exp/addons/api/v1alpha4/zz_generated.conversion.go

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

4 changes: 4 additions & 0 deletions exp/addons/api/v1beta1/clusterresourcesetbinding_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ type ClusterResourceSetBindingSpec struct {
// Bindings is a list of ClusterResourceSets and their resources.
// +optional
Bindings []*ResourceSetBinding `json:"bindings,omitempty"`

// ClusterName use the cluster name to determine which cluster the resource binding applies to.
// +optional
ClusterName string `json:"clusterName,omitempty"`
}

// ANCHOR_END: ClusterResourceSetBindingSpec
Expand Down

0 comments on commit 9d29c3f

Please sign in to comment.