Merge pull request #35 from alauda/build-error

Update finalizer and add back build error

Author: hangyan

go.mod

@@ -18,8 +18,6 @@ replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-
 
 replace github.com/deislabs/oras => github.com/deislabs/oras v0.7.0
 
-replace github.com/alauda/helm-crds => github.com/alauda/helm-crds v0.0.0-20190915014518-6c1be05f7d6e
-
 replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
 
 replace gomodules.xyz/jsonpatch/v2 => gomodules.xyz/jsonpatch/v2 v2.0.1
@@ -31,7 +29,7 @@ require (
 	github.com/Masterminds/sprig v2.18.0+incompatible // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/alauda/component-base v0.0.0-20190628064654-a4dafcfd3446
-	github.com/alauda/helm-crds v0.0.0-20190904040405-5d13ef317cd8
+	github.com/alauda/helm-crds v0.0.0-20191213075648-06c92685470a
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/bugsnag/bugsnag-go v1.5.2 // indirect
 	github.com/coreos/bbolt v1.3.3 // indirect

go.sum

@@ -34,8 +34,8 @@ github.com/alauda/component-base v0.0.0-20190628064654-a4dafcfd3446 h1:gtzuHCPUR
 github.com/alauda/component-base v0.0.0-20190628064654-a4dafcfd3446/go.mod h1:tbaXeIWDl6zX1b7O53FSXClDS1YmEDRnVJszgcLXzpk=
 github.com/alauda/helm v3.0.0-beta.3.0.20191204063239-30241b826b03+incompatible h1:9QZ2vElgHP7ZBDim2kJKfl6cGsDaTwsz9swaQrgHTlA=
 github.com/alauda/helm v3.0.0-beta.3.0.20191204063239-30241b826b03+incompatible/go.mod h1:puN71hQ/dtLbcyDOPyhZw19FrLSYCak3EvJBT2OaRvQ=
-github.com/alauda/helm-crds v0.0.0-20190915014518-6c1be05f7d6e h1:qjAHTkXagriFjAlOwQyQc6t7Up13BpWT2e2gyUncU8U=
-github.com/alauda/helm-crds v0.0.0-20190915014518-6c1be05f7d6e/go.mod h1:QzPKCROcmAchx7bBj6NrNM34bmMQCrJCb+GrXtYi72o=
+github.com/alauda/helm-crds v0.0.0-20191213075648-06c92685470a h1:HPmq/9C6Y2dceR9ZxWCvo4SXuzLl1Mn5kThqStjH0Ew=
+github.com/alauda/helm-crds v0.0.0-20191213075648-06c92685470a/go.mod h1:QzPKCROcmAchx7bBj6NrNM34bmMQCrJCb+GrXtYi72o=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=

pkg/cluster/info.go

@@ -58,7 +58,7 @@ func RestConfigToCluster(config *rest.Config, generatedName string) *Info {
 func GetClusters(client versioned.Interface, ns string, opts metav1.ListOptions) (*v1alpha1.ClusterList, error) {
 	origin, err := client.ClusterregistryV1alpha1().Clusters(ns).List(opts)
 	if err != nil {
-		if apierrors.IsNotFound(err){
+		if apierrors.IsNotFound(err) {
 			klog.Warning("no cluster found:", err)
 			return origin, nil
 		}

pkg/kube/client.go

@@ -2,6 +2,7 @@ package kube
 
 import (
 	"io"
+
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/kubernetes/scheme"
 
@@ -33,12 +34,12 @@ func New(getter genericclioptions.RESTClientGetter) *Client {
 	}
 }
 
-
 // Build validates for Kubernetes objects and returns resource Infos from a io.Reader.
 func (c *Client) Build(reader io.Reader) (kube.ResourceList, error) {
 	result, err := c.Client.Build(reader)
 	if err != nil {
 		klog.Warning("build resources error: ", err)
+		return result, err
 
 		// if strings.Contains(err.Error(), "apiVersion") && strings.Contains(err.Error(), "is not available") {
 		//	klog.Warning("encountered apiVersion not found it, ignore it: ", err)
@@ -48,7 +49,6 @@ func (c *Client) Build(reader io.Reader) (kube.ResourceList, error) {
 	return result, nil
 }
 
-
 // Create plan to support replace.... hold on...
 func (c *Client) Create(resources kube.ResourceList) (*kube.Result, error) {
 

pkg/util/kubernetes.go

@@ -18,4 +18,3 @@ func NewOwnerRef(owner metav1.Object, gvk schema.GroupVersionKind) *metav1.Owner
 		Controller:         &isController,
 	}
 }
-

pkg/util/vars.go

@@ -8,7 +8,7 @@ const (
 	LeaderLockName = "captain-controller-lock"
 
 	// FinalizerName is the finalizer name we append to each HelmRequest resource
-	FinalizerName = "captain.alauda.io"
+	FinalizerName = "captain.cpaas.io"
 
 	// ProjectKey is the annotation key for project
 	ProjectKey = "alauda.io/project"

tests.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #/usr/bin/env bash
 
 NORMAL=$(tput sgr0)

vendor/github.com/alauda/helm-crds/pkg/apis/app/v1alpha1/types.go

@@ -41,7 +41,7 @@ github.com/alauda/component-base/crd
 github.com/alauda/component-base/hash
 github.com/alauda/component-base/regex
 github.com/alauda/component-base/system
-# github.com/alauda/helm-crds v0.0.0-20190904040405-5d13ef317cd8 => github.com/alauda/helm-crds v0.0.0-20190915014518-6c1be05f7d6e
+# github.com/alauda/helm-crds v0.0.0-20191213075648-06c92685470a
 github.com/alauda/helm-crds/pkg/apis/app/v1alpha1
 github.com/alauda/helm-crds/pkg/client/clientset/versioned
 github.com/alauda/helm-crds/pkg/client/clientset/versioned/scheme