Skip to content

🌱 upgrade add-on APIs to v1beta1 #353

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.

Sign up for GitHub

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

Closed
elgnay wants to merge 1 commit into from
Closed

🌱 upgrade add-on APIs to v1beta1 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cmd/example/helloworld/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
utilflag "k8s.io/component-base/cli/flag"
logs "k8s.io/component-base/logs/api/v1"
"k8s.io/klog/v2"
addonv1alpha1client "open-cluster-management.io/api/client/addon/clientset/versioned"
addonv1beta1client "open-cluster-management.io/api/client/addon/clientset/versioned"

"open-cluster-management.io/addon-framework/examples/helloworld"
"open-cluster-management.io/addon-framework/examples/helloworld_agent"
Expand Down Expand Up @@ -85,7 +85,7 @@ type addManagerConfig struct {
}

func (c *addManagerConfig) runController(ctx context.Context, kubeConfig *rest.Config) error {
addonClient, err := addonv1alpha1client.NewForConfig(kubeConfig)
addonClient, err := addonv1beta1client.NewForConfig(kubeConfig)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/example/helloworld_helm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
utilflag "k8s.io/component-base/cli/flag"
logs "k8s.io/component-base/logs/api/v1"
"k8s.io/klog/v2"
addonv1alpha1client "open-cluster-management.io/api/client/addon/clientset/versioned"
addonv1beta1client "open-cluster-management.io/api/client/addon/clientset/versioned"

"open-cluster-management.io/addon-framework/examples/helloworld"
"open-cluster-management.io/addon-framework/examples/helloworld_agent"
Expand Down Expand Up @@ -84,7 +84,7 @@ func runController(ctx context.Context, kubeConfig *rest.Config) error {
return err
}

addonClient, err := addonv1alpha1client.NewForConfig(kubeConfig)
addonClient, err := addonv1beta1client.NewForConfig(kubeConfig)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions examples/helloworld/helloworld.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"open-cluster-management.io/addon-framework/pkg/addonfactory"
"open-cluster-management.io/addon-framework/pkg/agent"
"open-cluster-management.io/addon-framework/pkg/utils"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
clusterv1 "open-cluster-management.io/api/cluster/v1"
)

Expand All @@ -33,7 +33,7 @@ func NewRegistrationOption(kubeConfig *rest.Config, addonName, agentName string)
}

func GetDefaultValues(cluster *clusterv1.ManagedCluster,
addon *addonapiv1alpha1.ManagedClusterAddOn) (addonfactory.Values, error) {
addon *addonapiv1beta1.ManagedClusterAddOn) (addonfactory.Values, error) {

image := os.Getenv("EXAMPLE_IMAGE_NAME")
if len(image) == 0 {
Expand Down
19 changes: 8 additions & 11 deletions examples/helloworld/helloworld_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
utilrand "k8s.io/apimachinery/pkg/util/rand"
"k8s.io/klog/v2"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
fakeaddon "open-cluster-management.io/api/client/addon/clientset/versioned/fake"
clusterv1 "open-cluster-management.io/api/cluster/v1"

Expand All @@ -28,7 +29,7 @@ func TestManifestAddonAgent(t *testing.T) {
cases := []struct {
name string
managedCluster *clusterv1.ManagedCluster
managedClusterAddOn *addonapiv1alpha1.ManagedClusterAddOn
managedClusterAddOn *addonapiv1beta1.ManagedClusterAddOn
configs []runtime.Object
verifyDeployment func(t *testing.T, objs []runtime.Object)
}{
Expand Down Expand Up @@ -59,7 +60,7 @@ func TestManifestAddonAgent(t *testing.T) {
{
name: "override image with annotation",
managedCluster: addontesting.NewManagedCluster("cluster1"),
managedClusterAddOn: func() *addonapiv1alpha1.ManagedClusterAddOn {
managedClusterAddOn: func() *addonapiv1beta1.ManagedClusterAddOn {
addon := addontesting.NewAddon("test", "cluster1")
addon.Annotations = map[string]string{
"addon.open-cluster-management.io/values": `{"Image":"quay.io/test:test"}`}
Expand Down Expand Up @@ -88,20 +89,16 @@ func TestManifestAddonAgent(t *testing.T) {
{
name: "with addon deployment config",
managedCluster: addontesting.NewManagedCluster("cluster1"),
managedClusterAddOn: func() *addonapiv1alpha1.ManagedClusterAddOn {
managedClusterAddOn: func() *addonapiv1beta1.ManagedClusterAddOn {
addon := addontesting.NewAddon("test", "cluster1")
addon.Status.ConfigReferences = []addonapiv1alpha1.ConfigReference{
addon.Status.ConfigReferences = []addonapiv1beta1.ConfigReference{
{
ConfigGroupResource: addonapiv1alpha1.ConfigGroupResource{
ConfigGroupResource: addonapiv1beta1.ConfigGroupResource{
Group: "addon.open-cluster-management.io",
Resource: "addondeploymentconfigs",
},
ConfigReferent: addonapiv1alpha1.ConfigReferent{
Namespace: "cluster1",
Name: "config",
},
DesiredConfig: &addonapiv1alpha1.ConfigSpecHash{
ConfigReferent: addonapiv1alpha1.ConfigReferent{
DesiredConfig: &addonapiv1beta1.ConfigSpecHash{
ConfigReferent: addonapiv1beta1.ConfigReferent{
Namespace: "cluster1",
Name: "config",
},
Expand Down
10 changes: 5 additions & 5 deletions examples/helloworld_agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
cmdfactory "open-cluster-management.io/addon-framework/pkg/cmd/factory"
"open-cluster-management.io/addon-framework/pkg/lease"
"open-cluster-management.io/addon-framework/pkg/version"
addonv1alpha1client "open-cluster-management.io/api/client/addon/clientset/versioned"
addonv1beta1client "open-cluster-management.io/api/client/addon/clientset/versioned"
"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
)

Expand Down Expand Up @@ -93,7 +93,7 @@ func (o *AgentOptions) RunAgent(ctx context.Context, kubeconfig *rest.Config) er
if err != nil {
return err
}
addonClient, err := addonv1alpha1client.NewForConfig(hubRestConfig)
addonClient, err := addonv1beta1client.NewForConfig(hubRestConfig)
if err != nil {
return err
}
Expand Down Expand Up @@ -125,7 +125,7 @@ func (o *AgentOptions) RunAgent(ctx context.Context, kubeconfig *rest.Config) er

type agentController struct {
spokeKubeClient kubernetes.Interface
addonClient addonv1alpha1client.Interface
addonClient addonv1beta1client.Interface
hubConfigMapLister corev1lister.ConfigMapLister
clusterName string
addonName string
Expand All @@ -134,7 +134,7 @@ type agentController struct {

func newAgentController(
spokeKubeClient kubernetes.Interface,
addonClient addonv1alpha1client.Interface,
addonClient addonv1beta1client.Interface,
configmapInformers corev1informers.ConfigMapInformer,
clusterName string,
addonName string,
Expand Down Expand Up @@ -173,7 +173,7 @@ func (c *agentController) sync(ctx context.Context, syncCtx factory.SyncContext,
return err
}

addon, err := c.addonClient.AddonV1alpha1().ManagedClusterAddOns(clusterName).Get(ctx, c.addonName, metav1.GetOptions{})
addon, err := c.addonClient.AddonV1beta1().ManagedClusterAddOns(clusterName).Get(ctx, c.addonName, metav1.GetOptions{})
if err != nil {
return err
}
Expand Down
12 changes: 6 additions & 6 deletions examples/helloworld_helm/helloworld_helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/client-go/kubernetes"
"open-cluster-management.io/addon-framework/pkg/addonfactory"
"open-cluster-management.io/addon-framework/pkg/agent"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
clusterv1 "open-cluster-management.io/api/cluster/v1"
workapiv1 "open-cluster-management.io/api/work/v1"
)
Expand Down Expand Up @@ -41,7 +41,7 @@ type userValues struct {
}

func GetDefaultValues(cluster *clusterv1.ManagedCluster,
addon *addonapiv1alpha1.ManagedClusterAddOn) (addonfactory.Values, error) {
addon *addonapiv1beta1.ManagedClusterAddOn) (addonfactory.Values, error) {
image := os.Getenv("EXAMPLE_IMAGE_NAME")
if len(image) == 0 {
image = defaultImage
Expand All @@ -66,7 +66,7 @@ func GetDefaultValues(cluster *clusterv1.ManagedCluster,
func GetImageValues(kubeClient kubernetes.Interface) addonfactory.GetValuesFunc {
return func(
cluster *clusterv1.ManagedCluster,
addon *addonapiv1alpha1.ManagedClusterAddOn,
addon *addonapiv1beta1.ManagedClusterAddOn,
) (addonfactory.Values, error) {
overrideValues := addonfactory.Values{}
for _, config := range addon.Status.ConfigReferences {
Expand All @@ -88,12 +88,12 @@ func GetImageValues(kubeClient kubernetes.Interface) addonfactory.GetValuesFunc

image, ok := configMap.Data["image"]
if !ok {
return nil, fmt.Errorf("no image in configmap %s/%s", config.Namespace, config.Name)
return nil, fmt.Errorf("no image in configmap %s/%s", config.DesiredConfig.Namespace, config.DesiredConfig.Name)
}

imagePullPolicy, ok := configMap.Data["imagePullPolicy"]
if !ok {
return nil, fmt.Errorf("no imagePullPolicy in configmap %s/%s", config.Namespace, config.Name)
return nil, fmt.Errorf("no imagePullPolicy in configmap %s/%s", config.DesiredConfig.Namespace, config.DesiredConfig.Name)
}

userJsonValues := userValues{
Expand Down Expand Up @@ -135,7 +135,7 @@ func AgentHealthProber() *agent.HealthProber {
},
},
HealthChecker: func(fields []agent.FieldResult, cluster *clusterv1.ManagedCluster,
addon *addonapiv1alpha1.ManagedClusterAddOn) error {
addon *addonapiv1beta1.ManagedClusterAddOn) error {
if len(fields) == 0 {
return fmt.Errorf("no fields found in health checker")
}
Expand Down
27 changes: 13 additions & 14 deletions examples/helloworld_helm/helloworld_helm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
fakekube "k8s.io/client-go/kubernetes/fake"
"k8s.io/klog/v2"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
fakeaddon "open-cluster-management.io/api/client/addon/clientset/versioned/fake"
clusterv1 "open-cluster-management.io/api/cluster/v1"

Expand All @@ -34,7 +35,7 @@ func TestManifestAddonAgent(t *testing.T) {
cases := []struct {
name string
managedCluster *clusterv1.ManagedCluster
managedClusterAddOn *addonapiv1alpha1.ManagedClusterAddOn
managedClusterAddOn *addonapiv1beta1.ManagedClusterAddOn
configMaps []runtime.Object
addOnDeploymentConfigs []runtime.Object
verifyDeployment func(t *testing.T, objs []runtime.Object)
Expand Down Expand Up @@ -67,33 +68,31 @@ func TestManifestAddonAgent(t *testing.T) {
{
name: "with image config, addon deployment config and annotation",
managedCluster: addontesting.NewManagedCluster("cluster1"),
managedClusterAddOn: func() *addonapiv1alpha1.ManagedClusterAddOn {
managedClusterAddOn: func() *addonapiv1beta1.ManagedClusterAddOn {
addon := addontesting.NewAddon("test", "cluster1")
addon.SetAnnotations(map[string]string{
"addon.open-cluster-management.io/values": `{"global":{"imagePullSecret":"test-pull-secret","imagePullPolicy":"Never"}}`,
})
addon.Status.ConfigReferences = []addonapiv1alpha1.ConfigReference{
addon.Status.ConfigReferences = []addonapiv1beta1.ConfigReference{
{
ConfigGroupResource: addonapiv1alpha1.ConfigGroupResource{
ConfigGroupResource: addonapiv1beta1.ConfigGroupResource{
Group: "",
Resource: "configmaps",
},
ConfigReferent: addonapiv1alpha1.ConfigReferent{
Namespace: "cluster1",
Name: "image-config",
DesiredConfig: &addonapiv1beta1.ConfigSpecHash{
ConfigReferent: addonapiv1beta1.ConfigReferent{
Namespace: "cluster1",
Name: "image-config",
},
},
},
{
ConfigGroupResource: addonapiv1alpha1.ConfigGroupResource{
ConfigGroupResource: addonapiv1beta1.ConfigGroupResource{
Group: "addon.open-cluster-management.io",
Resource: "addondeploymentconfigs",
},
ConfigReferent: addonapiv1alpha1.ConfigReferent{
Namespace: "cluster1",
Name: "deploy-config",
},
DesiredConfig: &addonapiv1alpha1.ConfigSpecHash{
ConfigReferent: addonapiv1alpha1.ConfigReferent{
DesiredConfig: &addonapiv1beta1.ConfigSpecHash{
ConfigReferent: addonapiv1beta1.ConfigReferent{
Namespace: "cluster1",
Name: "deploy-config",
},
Expand Down
4 changes: 2 additions & 2 deletions examples/rbac/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"open-cluster-management.io/addon-framework/pkg/agent"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
clusterv1 "open-cluster-management.io/api/cluster/v1"
)

func AddonRBAC(kubeConfig *rest.Config) agent.PermissionConfigFunc {
return func(cluster *clusterv1.ManagedCluster, addon *addonapiv1alpha1.ManagedClusterAddOn) error {
return func(cluster *clusterv1.ManagedCluster, addon *addonapiv1beta1.ManagedClusterAddOn) error {
kubeclient, err := kubernetes.NewForConfig(kubeConfig)
if err != nil {
return err
Expand Down
9 changes: 5 additions & 4 deletions pkg/addonfactory/addondeploymentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
addonv1alpha1client "open-cluster-management.io/api/client/addon/clientset/versioned"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
addonv1beta1client "open-cluster-management.io/api/client/addon/clientset/versioned"
clusterv1 "open-cluster-management.io/api/cluster/v1"

"open-cluster-management.io/addon-framework/pkg/utils"
Expand Down Expand Up @@ -191,7 +192,7 @@ type AddOnDeploymentConfigToValuesFunc func(config addonapiv1alpha1.AddOnDeploym

// NewAddOnDeploymentConfigGetter returns a AddOnDeploymentConfigGetter with addon client
// Deprecated: use NewAddOnDeploymentConfigGetter in pkg/utils package instead.
func NewAddOnDeploymentConfigGetter(addonClient addonv1alpha1client.Interface) utils.AddOnDeploymentConfigGetter {
func NewAddOnDeploymentConfigGetter(addonClient addonv1beta1client.Interface) utils.AddOnDeploymentConfigGetter {
return utils.NewAddOnDeploymentConfigGetter(addonClient)
}

Expand All @@ -201,7 +202,7 @@ func NewAddOnDeploymentConfigGetter(addonClient addonv1alpha1client.Interface) u
// override the one from small index
func GetAddOnDeploymentConfigValues(
getter utils.AddOnDeploymentConfigGetter, toValuesFuncs ...AddOnDeploymentConfigToValuesFunc) GetValuesFunc {
return func(cluster *clusterv1.ManagedCluster, addon *addonapiv1alpha1.ManagedClusterAddOn) (Values, error) {
return func(cluster *clusterv1.ManagedCluster, addon *addonapiv1beta1.ManagedClusterAddOn) (Values, error) {
var lastValues = Values{}
addOnDeploymentConfig, err := utils.GetDesiredAddOnDeploymentConfig(addon, getter)
if err != nil {
Expand Down Expand Up @@ -382,7 +383,7 @@ func getRegistriesFromClusterAnnotation(
// will be: {"global": {"imageOverrides": {"helloWorldImage": "quay.io/ocm/addon-agent:v1"}}}
// - Image registries configured in the addonDeploymentConfig will take precedence over the managed cluster annotation
func GetAgentImageValues(getter utils.AddOnDeploymentConfigGetter, imageKey, image string) GetValuesFunc {
return func(cluster *clusterv1.ManagedCluster, addon *addonapiv1alpha1.ManagedClusterAddOn) (Values, error) {
return func(cluster *clusterv1.ManagedCluster, addon *addonapiv1beta1.ManagedClusterAddOn) (Values, error) {
addOnDeploymentConfig, err := utils.GetDesiredAddOnDeploymentConfig(addon, getter)
if err != nil {
return nil, err
Expand Down
Loading
Loading