Skip to content

Commit

Permalink
Merge pull request #83 from mittwald/bugfix/create-crd-if-not-exist
Browse files Browse the repository at this point in the history
Create CRDs when not present
  • Loading branch information
elenz97 authored May 9, 2022
2 parents 1d53dff + a77c9ca commit 2780ef0
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
29 changes: 29 additions & 0 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"reflect"
"strings"

"k8s.io/apimachinery/pkg/api/errors"

"github.com/spf13/pflag"
"helm.sh/helm/v3/pkg/action"
"helm.sh/helm/v3/pkg/chart"
Expand Down Expand Up @@ -573,14 +575,37 @@ func (c *HelmClient) upgradeCRD(ctx context.Context, k8sClient *clientset.Client
}
}

func (c *HelmClient) createCRDV1(ctx context.Context, cl *clientset.Clientset, crd *v1.CustomResourceDefinition) error {
if _, err := cl.ApiextensionsV1().CustomResourceDefinitions().Create(ctx, crd, metav1.CreateOptions{}); err != nil {
return err
}

c.DebugLog("create ran successful for CRD: %s", crd.Name)
return nil
}

func (c *HelmClient) createCRDV1Beta1(ctx context.Context, cl *clientset.Clientset, crd *v1beta1.CustomResourceDefinition) error {
if _, err := cl.ApiextensionsV1beta1().CustomResourceDefinitions().Create(ctx, crd, metav1.CreateOptions{}); err != nil {
return err
}

c.DebugLog("create ran successful for CRD: %s", crd.Name)
return nil
}

// upgradeCRDV1Beta1 upgrades a CRD of the v1beta1 API version using the provided k8s client and CRD yaml.
func (c *HelmClient) upgradeCRDV1Beta1(ctx context.Context, cl *clientset.Clientset, rawCRD []byte) error {
var crdObj v1beta1.CustomResourceDefinition
if err := json.Unmarshal(rawCRD, &crdObj); err != nil {
return err
}

existingCRDObj, err := cl.ApiextensionsV1beta1().CustomResourceDefinitions().Get(ctx, crdObj.Name, metav1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
return c.createCRDV1Beta1(ctx, cl, &crdObj)
}

return err
}

Expand Down Expand Up @@ -635,6 +660,10 @@ func (c *HelmClient) upgradeCRDV1(ctx context.Context, cl *clientset.Clientset,

existingCRDObj, err := cl.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crdObj.Name, metav1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
return c.createCRDV1(ctx, cl, &crdObj)
}

return err
}

Expand Down
1 change: 1 addition & 0 deletions client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package helmclient
import (
"bytes"
"context"

"helm.sh/helm/v3/pkg/repo"
"k8s.io/client-go/rest"
)
Expand Down

0 comments on commit 2780ef0

Please sign in to comment.