Skip to content

Commit

Permalink
Fixes to support v1 and v1beta1 API version for install command
Browse files Browse the repository at this point in the history 
This patch fixes to support to install tekton resources of
api version of v1beta1 and v1

fixes tektoncd#781

Signed-oof-by: Shiv Verma <shverma@redhat.com>
  • Loading branch information
@pratap0007 @tekton-robot
pratap0007 authored and tekton-robot committed Feb 13, 2023
1 parent 6129740 commit 84be703
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 15 deletions.
14 changes: 11 additions & 3 deletions api/pkg/cli/installer/gvr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ var (
apiGroupRes []*restmapper.APIGroupResources
)

func getGroupVersionResource(gr schema.GroupVersionResource, discovery discovery.DiscoveryInterface) (*schema.GroupVersionResource, error) {
func getVersionList(gr schema.GroupVersionResource, discovery discovery.DiscoveryInterface) ([]string, error) {
var err error

doOnce.Do(func() {
err = initializeAPIGroupRes(discovery)
})
Expand All @@ -37,17 +38,24 @@ func getGroupVersionResource(gr schema.GroupVersionResource, discovery discovery
}

rm := restmapper.NewDiscoveryRESTMapper(apiGroupRes)
gvr, err := rm.ResourceFor(gr)

gvrs, err := rm.ResourcesFor(gr)
if err != nil {
return nil, err
}

return &gvr, nil
versions := []string{}
for _, gvr := range gvrs {
versions = append(versions, gvr.Version)
}

return versions, err
}

func initializeAPIGroupRes(discovery discovery.DiscoveryInterface) error {
var err error
apiGroupRes, err = restmapper.GetAPIGroupResources(discovery)

if err != nil {
return err
}
Expand Down
68 changes: 56 additions & 12 deletions api/pkg/cli/installer/kube_action.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package installer

import (
"context"
"fmt"
"strings"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -27,13 +28,24 @@ const tektonGroup = "tekton.dev"

func (i *Installer) create(object *unstructured.Unstructured, namespace string, op metav1.CreateOptions) (*unstructured.Unstructured, error) {

gvrObj := schema.GroupVersionResource{Group: tektonGroup, Resource: object.GetKind()}
gvr, err := getGroupVersionResource(gvrObj, i.cs.Tekton().Discovery())
grObj := schema.GroupVersionResource{Group: tektonGroup, Resource: object.GetKind()}
versions, err := getVersionList(grObj, i.cs.Tekton().Discovery())
if err != nil {
return nil, err
}

obj, err := i.cs.Dynamic().Resource(*gvr).Namespace(namespace).Create(context.Background(), object, op)
gvr := schema.GroupVersionResource{
Group: object.GroupVersionKind().Group,
Resource: strings.ToLower(object.GetKind()) + "s",
}

if contains(versions, object.GroupVersionKind().Version) {
gvr.Version = object.GroupVersionKind().Version
} else {
return nil, fmt.Errorf("Error: API version in the data %s does not match the expected API version", object.GroupVersionKind().Version)
}

obj, err := i.cs.Dynamic().Resource(gvr).Namespace(namespace).Create(context.Background(), object, op)
if err != nil {
return nil, err
}
Expand All @@ -42,12 +54,18 @@ func (i *Installer) create(object *unstructured.Unstructured, namespace string,

func (i *Installer) get(objectName, kind, namespace string, op metav1.GetOptions) (*unstructured.Unstructured, error) {

gvrObj := schema.GroupVersionResource{Group: tektonGroup, Resource: kind}
gvr, err := getGroupVersionResource(gvrObj, i.cs.Tekton().Discovery())
grObj := schema.GroupVersionResource{Group: tektonGroup, Resource: kind}
versions, err := getVersionList(grObj, i.cs.Tekton().Discovery())
if err != nil {
return nil, err
}
obj, err := i.cs.Dynamic().Resource(*gvr).Namespace(namespace).Get(context.Background(), objectName, op)

gvr := schema.GroupVersionResource{
Group: tektonGroup,
Resource: strings.ToLower(kind) + "s",
Version: versions[0],
}
obj, err := i.cs.Dynamic().Resource(gvr).Namespace(namespace).Get(context.Background(), objectName, op)
if err != nil {
return nil, err
}
Expand All @@ -56,12 +74,22 @@ func (i *Installer) get(objectName, kind, namespace string, op metav1.GetOptions

func (i *Installer) update(object *unstructured.Unstructured, namespace string, op metav1.UpdateOptions) (*unstructured.Unstructured, error) {

gvrObj := schema.GroupVersionResource{Group: tektonGroup, Resource: object.GetKind()}
gvr, err := getGroupVersionResource(gvrObj, i.cs.Tekton().Discovery())
grObj := schema.GroupVersionResource{Group: tektonGroup, Resource: object.GetKind()}
versions, err := getVersionList(grObj, i.cs.Tekton().Discovery())
if err != nil {
return nil, err
}
obj, err := i.cs.Dynamic().Resource(*gvr).Namespace(namespace).Update(context.Background(), object, op)
gvr := schema.GroupVersionResource{
Group: object.GroupVersionKind().Group,
Resource: strings.ToLower(object.GetKind()) + "s",
}
if contains(versions, object.GroupVersionKind().Version) {
gvr.Version = object.GroupVersionKind().Version
} else {
return nil, fmt.Errorf("Error: API version in the data %s does not match the expected API version", object.GroupVersionKind().Version)
}

obj, err := i.cs.Dynamic().Resource(gvr).Namespace(namespace).Update(context.Background(), object, op)
if err != nil {
return nil, err
}
Expand All @@ -70,14 +98,30 @@ func (i *Installer) update(object *unstructured.Unstructured, namespace string,

func (i *Installer) list(kind, namespace string, op metav1.ListOptions) (*unstructured.UnstructuredList, error) {

gvrObj := schema.GroupVersionResource{Group: tektonGroup, Resource: strings.ToLower(kind) + "s"}
gvr, err := getGroupVersionResource(gvrObj, i.cs.Tekton().Discovery())
grObj := schema.GroupVersionResource{Group: tektonGroup, Resource: strings.ToLower(kind) + "s"}
versions, err := getVersionList(grObj, i.cs.Tekton().Discovery())
if err != nil {
return nil, err
}
obj, err := i.cs.Dynamic().Resource(*gvr).Namespace(namespace).List(context.Background(), op)

gvr := schema.GroupVersionResource{
Group: tektonGroup,
Resource: strings.ToLower(kind) + "s",
Version: versions[0],
}
obj, err := i.cs.Dynamic().Resource(gvr).Namespace(namespace).List(context.Background(), op)
if err != nil {
return nil, err
}
return obj, nil
}

// contains checks whether the array contains the string and return true or false
func contains(list []string, value string) bool {
for _, item := range list {
if item == value {
return true
}
}
return false
}

0 comments on commit 84be703

Please sign in to comment.