Browse Source

Bumps the FluxHelmRelease API version to v1alpha2

Reasons:
- Incorrect initial API vesrion, inconsistent with the Kubernetes one
- Breaking change in the FluxHelmRelease schema
(https://github.com/weaveworks/flux/pull/1035)

Note:
Associated changes made also in the example user repo
weaveworks/flux-helm-test
Tamara Kaufler 2 years ago
parent
commit
bef1c9d4cc
35 changed files with 143 additions and 143 deletions
  1. 1
    1
      Gopkg.lock
  2. 1
    1
      apis/helm.integrations.flux.weave.works/v1alpha2/doc.go
  3. 2
    2
      apis/helm.integrations.flux.weave.works/v1alpha2/register.go
  4. 1
    1
      apis/helm.integrations.flux.weave.works/v1alpha2/types.go
  5. 1
    1
      apis/helm.integrations.flux.weave.works/v1alpha2/types_test.go
  6. 1
    1
      apis/helm.integrations.flux.weave.works/v1alpha2/zz_generated.deepcopy.go
  7. 1
    1
      bin/helm/update_codegen.sh
  8. 1
    1
      cmd/helm-operator/main.go
  9. 1
    1
      deploy-helm/flux-helm-release-crd.yaml
  10. 1
    1
      deploy-helm/helm-operator-deployment.yaml
  11. 12
    12
      integrations/client/clientset/versioned/clientset.go
  12. 8
    8
      integrations/client/clientset/versioned/fake/clientset_generated.go
  13. 2
    2
      integrations/client/clientset/versioned/fake/register.go
  14. 2
    2
      integrations/client/clientset/versioned/scheme/register.go
  15. 1
    1
      integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/doc.go
  16. 0
    0
      integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake/doc.go
  17. 22
    22
      integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake/fake_fluxhelmrelease.go
  18. 4
    4
      integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake/fake_helm.integrations.flux.weave.works_client.go
  19. 18
    18
      integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fluxhelmrelease.go
  20. 1
    1
      integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/generated_expansion.go
  21. 16
    16
      integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/helm.integrations.flux.weave.works_client.go
  22. 4
    4
      integrations/client/informers/externalversions/generic.go
  23. 6
    6
      integrations/client/informers/externalversions/helm.integrations.flux.weave.works/interface.go
  24. 10
    10
      integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha2/fluxhelmrelease.go
  25. 1
    1
      integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha2/interface.go
  26. 1
    1
      integrations/client/listers/helm.integrations.flux.weave.works/v1alpha2/expansion_generated.go
  27. 12
    12
      integrations/client/listers/helm.integrations.flux.weave.works/v1alpha2/fluxhelmrelease.go
  28. 2
    2
      integrations/helm/chartsync/chartsync.go
  29. 2
    2
      integrations/helm/customresource/customresource.go
  30. 3
    3
      integrations/helm/operator/operator.go
  31. 1
    1
      integrations/helm/release/release.go
  32. 1
    1
      integrations/helm/releasesync/releasesync.go
  33. 1
    1
      integrations/helm/releasesync/utils.go
  34. 1
    1
      site/helm/helm-integration-requirements.md
  35. 1
    1
      site/helm/helm-integration.md

+ 1
- 1
Gopkg.lock View File

@@ -804,6 +804,6 @@
804 804
 [solve-meta]
805 805
   analyzer-name = "dep"
806 806
   analyzer-version = 1
807
-  inputs-digest = "a98c682b9eb1beeff8d0d567377f6d95e98c01bb937fdd0a58bdd91e733bf7ac"
807
+  inputs-digest = "18e1f9cb0f7c43cf67a0ee5b21699771d4c1474b521b3f9a41d863b0291e3a62"
808 808
   solver-name = "gps-cdcl"
809 809
   solver-version = 1

apis/helm.integrations.flux.weave.works/v1alpha/doc.go → apis/helm.integrations.flux.weave.works/v1alpha2/doc.go View File

@@ -2,4 +2,4 @@
2 2
 
3 3
 // Package v1 is the v1 version of the API.
4 4
 // +groupName=helm.integrations.flux.weave.works
5
-package v1alpha
5
+package v1alpha2

apis/helm.integrations.flux.weave.works/v1alpha/register.go → apis/helm.integrations.flux.weave.works/v1alpha2/register.go View File

@@ -1,4 +1,4 @@
1
-package v1alpha
1
+package v1alpha2
2 2
 
3 3
 import (
4 4
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -9,7 +9,7 @@ import (
9 9
 )
10 10
 
11 11
 // SchemeGroupVersion is group version used to register these objects
12
-var SchemeGroupVersion = schema.GroupVersion{Group: fluxintegrations.GroupName, Version: "v1alpha"}
12
+var SchemeGroupVersion = schema.GroupVersion{Group: fluxintegrations.GroupName, Version: "v1alpha2"}
13 13
 
14 14
 // Resource takes an unqualified resource and returns a Group qualified GroupResource
15 15
 func Resource(resource string) schema.GroupResource {

apis/helm.integrations.flux.weave.works/v1alpha/types.go → apis/helm.integrations.flux.weave.works/v1alpha2/types.go View File

@@ -1,4 +1,4 @@
1
-package v1alpha
1
+package v1alpha2
2 2
 
3 3
 import (
4 4
 	"github.com/ghodss/yaml"

apis/helm.integrations.flux.weave.works/v1alpha/types_test.go → apis/helm.integrations.flux.weave.works/v1alpha2/types_test.go View File

@@ -1,4 +1,4 @@
1
-package v1alpha
1
+package v1alpha2
2 2
 
3 3
 import (
4 4
 	"testing"

apis/helm.integrations.flux.weave.works/v1alpha/zz_generated.deepcopy.go → apis/helm.integrations.flux.weave.works/v1alpha2/zz_generated.deepcopy.go View File

@@ -18,7 +18,7 @@ limitations under the License.
18 18
 
19 19
 // This file was autogenerated by deepcopy-gen. Do not edit it manually!
20 20
 
21
-package v1alpha
21
+package v1alpha2
22 22
 
23 23
 import (
24 24
 	runtime "k8s.io/apimachinery/pkg/runtime"

+ 1
- 1
bin/helm/update_codegen.sh View File

@@ -8,6 +8,6 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
8 8
 CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ${GOPATH}/src/k8s.io/code-generator)}
9 9
 
10 10
 ${CODEGEN_PKG}/generate-groups.sh all github.com/weaveworks/flux/integrations/client \
11
-  github.com/weaveworks/flux/apis helm.integrations.flux.weave.works:v1alpha \
11
+  github.com/weaveworks/flux/apis helm.integrations.flux.weave.works:v1alpha2 \
12 12
   --go-header-file ${SCRIPT_ROOT}/bin/helm/custom-boilerplate.go.txt
13 13
 

+ 1
- 1
cmd/helm-operator/main.go View File

@@ -204,7 +204,7 @@ func main() {
204 204
 	//				operator attaches event handler to the informer and syncs the informer cache
205 205
 	ifInformerFactory := ifinformers.NewSharedInformerFactory(ifClient, 30*time.Second)
206 206
 	// Reference to shared index informers for the FluxHelmRelease
207
-	fhrInformer := ifInformerFactory.Helm().V1alpha().FluxHelmReleases()
207
+	fhrInformer := ifInformerFactory.Helm().V1alpha2().FluxHelmReleases()
208 208
 
209 209
 	opr := operator.New(log.With(logger, "component", "operator"), kubeClient, fhrInformer, rel)
210 210
 	// Starts handling k8s events related to the given resource kind

+ 1
- 1
deploy-helm/flux-helm-release-crd.yaml View File

@@ -10,4 +10,4 @@ spec:
10 10
     listKind: FluxHelmReleaseList
11 11
     plural: fluxhelmreleases
12 12
   scope: Namespaced
13
-  version: v1alpha
13
+  version: v1alpha2

+ 1
- 1
deploy-helm/helm-operator-deployment.yaml View File

@@ -23,7 +23,7 @@ spec:
23 23
         # There are no ":latest" images for helm-operator. Find the most recent
24 24
         # release or image version at https://quay.io/weaveworks/helm-operator
25 25
         # and replace the tag here.
26
-        image: quay.io/weaveworks/helm-operator:alpha
26
+        image: quay.io/weaveworks/helm-operator:0.1.0-alpha
27 27
         imagePullPolicy: IfNotPresent
28 28
         volumeMounts:
29 29
         - name: git-key

+ 12
- 12
integrations/client/clientset/versioned/clientset.go View File

@@ -17,7 +17,7 @@ package versioned
17 17
 
18 18
 import (
19 19
 	glog "github.com/golang/glog"
20
-	helmv1alpha "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha"
20
+	helmv1alpha2 "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2"
21 21
 	discovery "k8s.io/client-go/discovery"
22 22
 	rest "k8s.io/client-go/rest"
23 23
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
@@ -25,27 +25,27 @@ import (
25 25
 
26 26
 type Interface interface {
27 27
 	Discovery() discovery.DiscoveryInterface
28
-	HelmV1alpha() helmv1alpha.HelmV1alphaInterface
28
+	HelmV1alpha2() helmv1alpha2.HelmV1alpha2Interface
29 29
 	// Deprecated: please explicitly pick a version if possible.
30
-	Helm() helmv1alpha.HelmV1alphaInterface
30
+	Helm() helmv1alpha2.HelmV1alpha2Interface
31 31
 }
32 32
 
33 33
 // Clientset contains the clients for groups. Each group has exactly one
34 34
 // version included in a Clientset.
35 35
 type Clientset struct {
36 36
 	*discovery.DiscoveryClient
37
-	helmV1alpha *helmv1alpha.HelmV1alphaClient
37
+	helmV1alpha2 *helmv1alpha2.HelmV1alpha2Client
38 38
 }
39 39
 
40
-// HelmV1alpha retrieves the HelmV1alphaClient
41
-func (c *Clientset) HelmV1alpha() helmv1alpha.HelmV1alphaInterface {
42
-	return c.helmV1alpha
40
+// HelmV1alpha2 retrieves the HelmV1alpha2Client
41
+func (c *Clientset) HelmV1alpha2() helmv1alpha2.HelmV1alpha2Interface {
42
+	return c.helmV1alpha2
43 43
 }
44 44
 
45 45
 // Deprecated: Helm retrieves the default version of HelmClient.
46 46
 // Please explicitly pick a version.
47
-func (c *Clientset) Helm() helmv1alpha.HelmV1alphaInterface {
48
-	return c.helmV1alpha
47
+func (c *Clientset) Helm() helmv1alpha2.HelmV1alpha2Interface {
48
+	return c.helmV1alpha2
49 49
 }
50 50
 
51 51
 // Discovery retrieves the DiscoveryClient
@@ -64,7 +64,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
64 64
 	}
65 65
 	var cs Clientset
66 66
 	var err error
67
-	cs.helmV1alpha, err = helmv1alpha.NewForConfig(&configShallowCopy)
67
+	cs.helmV1alpha2, err = helmv1alpha2.NewForConfig(&configShallowCopy)
68 68
 	if err != nil {
69 69
 		return nil, err
70 70
 	}
@@ -81,7 +81,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
81 81
 // panics if there is an error in the config.
82 82
 func NewForConfigOrDie(c *rest.Config) *Clientset {
83 83
 	var cs Clientset
84
-	cs.helmV1alpha = helmv1alpha.NewForConfigOrDie(c)
84
+	cs.helmV1alpha2 = helmv1alpha2.NewForConfigOrDie(c)
85 85
 
86 86
 	cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
87 87
 	return &cs
@@ -90,7 +90,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
90 90
 // New creates a new Clientset for the given RESTClient.
91 91
 func New(c rest.Interface) *Clientset {
92 92
 	var cs Clientset
93
-	cs.helmV1alpha = helmv1alpha.New(c)
93
+	cs.helmV1alpha2 = helmv1alpha2.New(c)
94 94
 
95 95
 	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
96 96
 	return &cs

+ 8
- 8
integrations/client/clientset/versioned/fake/clientset_generated.go View File

@@ -17,8 +17,8 @@ package fake
17 17
 
18 18
 import (
19 19
 	clientset "github.com/weaveworks/flux/integrations/client/clientset/versioned"
20
-	helmv1alpha "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha"
21
-	fakehelmv1alpha "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/fake"
20
+	helmv1alpha2 "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2"
21
+	fakehelmv1alpha2 "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake"
22 22
 	"k8s.io/apimachinery/pkg/runtime"
23 23
 	"k8s.io/apimachinery/pkg/watch"
24 24
 	"k8s.io/client-go/discovery"
@@ -59,12 +59,12 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
59 59
 
60 60
 var _ clientset.Interface = &Clientset{}
61 61
 
62
-// HelmV1alpha retrieves the HelmV1alphaClient
63
-func (c *Clientset) HelmV1alpha() helmv1alpha.HelmV1alphaInterface {
64
-	return &fakehelmv1alpha.FakeHelmV1alpha{Fake: &c.Fake}
62
+// HelmV1alpha2 retrieves the HelmV1alpha2Client
63
+func (c *Clientset) HelmV1alpha2() helmv1alpha2.HelmV1alpha2Interface {
64
+	return &fakehelmv1alpha2.FakeHelmV1alpha2{Fake: &c.Fake}
65 65
 }
66 66
 
67
-// Helm retrieves the HelmV1alphaClient
68
-func (c *Clientset) Helm() helmv1alpha.HelmV1alphaInterface {
69
-	return &fakehelmv1alpha.FakeHelmV1alpha{Fake: &c.Fake}
67
+// Helm retrieves the HelmV1alpha2Client
68
+func (c *Clientset) Helm() helmv1alpha2.HelmV1alpha2Interface {
69
+	return &fakehelmv1alpha2.FakeHelmV1alpha2{Fake: &c.Fake}
70 70
 }

+ 2
- 2
integrations/client/clientset/versioned/fake/register.go View File

@@ -16,7 +16,7 @@ limitations under the License.
16 16
 package fake
17 17
 
18 18
 import (
19
-	helmv1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
19
+	helmv1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
20 20
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21 21
 	runtime "k8s.io/apimachinery/pkg/runtime"
22 22
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -47,6 +47,6 @@ func init() {
47 47
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
48 48
 // correctly.
49 49
 func AddToScheme(scheme *runtime.Scheme) {
50
-	helmv1alpha.AddToScheme(scheme)
50
+	helmv1alpha2.AddToScheme(scheme)
51 51
 
52 52
 }

+ 2
- 2
integrations/client/clientset/versioned/scheme/register.go View File

@@ -16,7 +16,7 @@ limitations under the License.
16 16
 package scheme
17 17
 
18 18
 import (
19
-	helmv1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
19
+	helmv1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
20 20
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21 21
 	runtime "k8s.io/apimachinery/pkg/runtime"
22 22
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -47,6 +47,6 @@ func init() {
47 47
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
48 48
 // correctly.
49 49
 func AddToScheme(scheme *runtime.Scheme) {
50
-	helmv1alpha.AddToScheme(scheme)
50
+	helmv1alpha2.AddToScheme(scheme)
51 51
 
52 52
 }

integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/doc.go → integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/doc.go View File

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
14 14
 limitations under the License.
15 15
 */
16 16
 // This package has the automatically generated typed clients.
17
-package v1alpha
17
+package v1alpha2

integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/fake/doc.go → integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake/doc.go View File


integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/fake/fake_fluxhelmrelease.go → integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake/fake_fluxhelmrelease.go View File

@@ -16,7 +16,7 @@ limitations under the License.
16 16
 package fake
17 17
 
18 18
 import (
19
-	v1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
19
+	v1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
20 20
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21 21
 	labels "k8s.io/apimachinery/pkg/labels"
22 22
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -27,29 +27,29 @@ import (
27 27
 
28 28
 // FakeFluxHelmReleases implements FluxHelmReleaseInterface
29 29
 type FakeFluxHelmReleases struct {
30
-	Fake *FakeHelmV1alpha
30
+	Fake *FakeHelmV1alpha2
31 31
 	ns   string
32 32
 }
33 33
 
34
-var fluxhelmreleasesResource = schema.GroupVersionResource{Group: "helm.integrations.flux.weave.works", Version: "v1alpha", Resource: "fluxhelmreleases"}
34
+var fluxhelmreleasesResource = schema.GroupVersionResource{Group: "helm.integrations.flux.weave.works", Version: "v1alpha2", Resource: "fluxhelmreleases"}
35 35
 
36
-var fluxhelmreleasesKind = schema.GroupVersionKind{Group: "helm.integrations.flux.weave.works", Version: "v1alpha", Kind: "FluxHelmRelease"}
36
+var fluxhelmreleasesKind = schema.GroupVersionKind{Group: "helm.integrations.flux.weave.works", Version: "v1alpha2", Kind: "FluxHelmRelease"}
37 37
 
38 38
 // Get takes name of the fluxHelmRelease, and returns the corresponding fluxHelmRelease object, and an error if there is any.
39
-func (c *FakeFluxHelmReleases) Get(name string, options v1.GetOptions) (result *v1alpha.FluxHelmRelease, err error) {
39
+func (c *FakeFluxHelmReleases) Get(name string, options v1.GetOptions) (result *v1alpha2.FluxHelmRelease, err error) {
40 40
 	obj, err := c.Fake.
41
-		Invokes(testing.NewGetAction(fluxhelmreleasesResource, c.ns, name), &v1alpha.FluxHelmRelease{})
41
+		Invokes(testing.NewGetAction(fluxhelmreleasesResource, c.ns, name), &v1alpha2.FluxHelmRelease{})
42 42
 
43 43
 	if obj == nil {
44 44
 		return nil, err
45 45
 	}
46
-	return obj.(*v1alpha.FluxHelmRelease), err
46
+	return obj.(*v1alpha2.FluxHelmRelease), err
47 47
 }
48 48
 
49 49
 // List takes label and field selectors, and returns the list of FluxHelmReleases that match those selectors.
50
-func (c *FakeFluxHelmReleases) List(opts v1.ListOptions) (result *v1alpha.FluxHelmReleaseList, err error) {
50
+func (c *FakeFluxHelmReleases) List(opts v1.ListOptions) (result *v1alpha2.FluxHelmReleaseList, err error) {
51 51
 	obj, err := c.Fake.
52
-		Invokes(testing.NewListAction(fluxhelmreleasesResource, fluxhelmreleasesKind, c.ns, opts), &v1alpha.FluxHelmReleaseList{})
52
+		Invokes(testing.NewListAction(fluxhelmreleasesResource, fluxhelmreleasesKind, c.ns, opts), &v1alpha2.FluxHelmReleaseList{})
53 53
 
54 54
 	if obj == nil {
55 55
 		return nil, err
@@ -59,8 +59,8 @@ func (c *FakeFluxHelmReleases) List(opts v1.ListOptions) (result *v1alpha.FluxHe
59 59
 	if label == nil {
60 60
 		label = labels.Everything()
61 61
 	}
62
-	list := &v1alpha.FluxHelmReleaseList{}
63
-	for _, item := range obj.(*v1alpha.FluxHelmReleaseList).Items {
62
+	list := &v1alpha2.FluxHelmReleaseList{}
63
+	for _, item := range obj.(*v1alpha2.FluxHelmReleaseList).Items {
64 64
 		if label.Matches(labels.Set(item.Labels)) {
65 65
 			list.Items = append(list.Items, item)
66 66
 		}
@@ -76,31 +76,31 @@ func (c *FakeFluxHelmReleases) Watch(opts v1.ListOptions) (watch.Interface, erro
76 76
 }
77 77
 
78 78
 // Create takes the representation of a fluxHelmRelease and creates it.  Returns the server's representation of the fluxHelmRelease, and an error, if there is any.
79
-func (c *FakeFluxHelmReleases) Create(fluxHelmRelease *v1alpha.FluxHelmRelease) (result *v1alpha.FluxHelmRelease, err error) {
79
+func (c *FakeFluxHelmReleases) Create(fluxHelmRelease *v1alpha2.FluxHelmRelease) (result *v1alpha2.FluxHelmRelease, err error) {
80 80
 	obj, err := c.Fake.
81
-		Invokes(testing.NewCreateAction(fluxhelmreleasesResource, c.ns, fluxHelmRelease), &v1alpha.FluxHelmRelease{})
81
+		Invokes(testing.NewCreateAction(fluxhelmreleasesResource, c.ns, fluxHelmRelease), &v1alpha2.FluxHelmRelease{})
82 82
 
83 83
 	if obj == nil {
84 84
 		return nil, err
85 85
 	}
86
-	return obj.(*v1alpha.FluxHelmRelease), err
86
+	return obj.(*v1alpha2.FluxHelmRelease), err
87 87
 }
88 88
 
89 89
 // Update takes the representation of a fluxHelmRelease and updates it. Returns the server's representation of the fluxHelmRelease, and an error, if there is any.
90
-func (c *FakeFluxHelmReleases) Update(fluxHelmRelease *v1alpha.FluxHelmRelease) (result *v1alpha.FluxHelmRelease, err error) {
90
+func (c *FakeFluxHelmReleases) Update(fluxHelmRelease *v1alpha2.FluxHelmRelease) (result *v1alpha2.FluxHelmRelease, err error) {
91 91
 	obj, err := c.Fake.
92
-		Invokes(testing.NewUpdateAction(fluxhelmreleasesResource, c.ns, fluxHelmRelease), &v1alpha.FluxHelmRelease{})
92
+		Invokes(testing.NewUpdateAction(fluxhelmreleasesResource, c.ns, fluxHelmRelease), &v1alpha2.FluxHelmRelease{})
93 93
 
94 94
 	if obj == nil {
95 95
 		return nil, err
96 96
 	}
97
-	return obj.(*v1alpha.FluxHelmRelease), err
97
+	return obj.(*v1alpha2.FluxHelmRelease), err
98 98
 }
99 99
 
100 100
 // Delete takes name of the fluxHelmRelease and deletes it. Returns an error if one occurs.
101 101
 func (c *FakeFluxHelmReleases) Delete(name string, options *v1.DeleteOptions) error {
102 102
 	_, err := c.Fake.
103
-		Invokes(testing.NewDeleteAction(fluxhelmreleasesResource, c.ns, name), &v1alpha.FluxHelmRelease{})
103
+		Invokes(testing.NewDeleteAction(fluxhelmreleasesResource, c.ns, name), &v1alpha2.FluxHelmRelease{})
104 104
 
105 105
 	return err
106 106
 }
@@ -109,17 +109,17 @@ func (c *FakeFluxHelmReleases) Delete(name string, options *v1.DeleteOptions) er
109 109
 func (c *FakeFluxHelmReleases) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
110 110
 	action := testing.NewDeleteCollectionAction(fluxhelmreleasesResource, c.ns, listOptions)
111 111
 
112
-	_, err := c.Fake.Invokes(action, &v1alpha.FluxHelmReleaseList{})
112
+	_, err := c.Fake.Invokes(action, &v1alpha2.FluxHelmReleaseList{})
113 113
 	return err
114 114
 }
115 115
 
116 116
 // Patch applies the patch and returns the patched fluxHelmRelease.
117
-func (c *FakeFluxHelmReleases) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha.FluxHelmRelease, err error) {
117
+func (c *FakeFluxHelmReleases) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha2.FluxHelmRelease, err error) {
118 118
 	obj, err := c.Fake.
119
-		Invokes(testing.NewPatchSubresourceAction(fluxhelmreleasesResource, c.ns, name, data, subresources...), &v1alpha.FluxHelmRelease{})
119
+		Invokes(testing.NewPatchSubresourceAction(fluxhelmreleasesResource, c.ns, name, data, subresources...), &v1alpha2.FluxHelmRelease{})
120 120
 
121 121
 	if obj == nil {
122 122
 		return nil, err
123 123
 	}
124
-	return obj.(*v1alpha.FluxHelmRelease), err
124
+	return obj.(*v1alpha2.FluxHelmRelease), err
125 125
 }

integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/fake/fake_helm.integrations.flux.weave.works_client.go → integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fake/fake_helm.integrations.flux.weave.works_client.go View File

@@ -16,22 +16,22 @@ limitations under the License.
16 16
 package fake
17 17
 
18 18
 import (
19
-	v1alpha "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha"
19
+	v1alpha2 "github.com/weaveworks/flux/integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2"
20 20
 	rest "k8s.io/client-go/rest"
21 21
 	testing "k8s.io/client-go/testing"
22 22
 )
23 23
 
24
-type FakeHelmV1alpha struct {
24
+type FakeHelmV1alpha2 struct {
25 25
 	*testing.Fake
26 26
 }
27 27
 
28
-func (c *FakeHelmV1alpha) FluxHelmReleases(namespace string) v1alpha.FluxHelmReleaseInterface {
28
+func (c *FakeHelmV1alpha2) FluxHelmReleases(namespace string) v1alpha2.FluxHelmReleaseInterface {
29 29
 	return &FakeFluxHelmReleases{c, namespace}
30 30
 }
31 31
 
32 32
 // RESTClient returns a RESTClient that is used to communicate
33 33
 // with API server by this client implementation.
34
-func (c *FakeHelmV1alpha) RESTClient() rest.Interface {
34
+func (c *FakeHelmV1alpha2) RESTClient() rest.Interface {
35 35
 	var ret *rest.RESTClient
36 36
 	return ret
37 37
 }

integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/fluxhelmrelease.go → integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/fluxhelmrelease.go View File

@@ -13,10 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 13
 See the License for the specific language governing permissions and
14 14
 limitations under the License.
15 15
 */
16
-package v1alpha
16
+package v1alpha2
17 17
 
18 18
 import (
19
-	v1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
19
+	v1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
20 20
 	scheme "github.com/weaveworks/flux/integrations/client/clientset/versioned/scheme"
21 21
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22 22
 	types "k8s.io/apimachinery/pkg/types"
@@ -32,14 +32,14 @@ type FluxHelmReleasesGetter interface {
32 32
 
33 33
 // FluxHelmReleaseInterface has methods to work with FluxHelmRelease resources.
34 34
 type FluxHelmReleaseInterface interface {
35
-	Create(*v1alpha.FluxHelmRelease) (*v1alpha.FluxHelmRelease, error)
36
-	Update(*v1alpha.FluxHelmRelease) (*v1alpha.FluxHelmRelease, error)
35
+	Create(*v1alpha2.FluxHelmRelease) (*v1alpha2.FluxHelmRelease, error)
36
+	Update(*v1alpha2.FluxHelmRelease) (*v1alpha2.FluxHelmRelease, error)
37 37
 	Delete(name string, options *v1.DeleteOptions) error
38 38
 	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
39
-	Get(name string, options v1.GetOptions) (*v1alpha.FluxHelmRelease, error)
40
-	List(opts v1.ListOptions) (*v1alpha.FluxHelmReleaseList, error)
39
+	Get(name string, options v1.GetOptions) (*v1alpha2.FluxHelmRelease, error)
40
+	List(opts v1.ListOptions) (*v1alpha2.FluxHelmReleaseList, error)
41 41
 	Watch(opts v1.ListOptions) (watch.Interface, error)
42
-	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha.FluxHelmRelease, err error)
42
+	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha2.FluxHelmRelease, err error)
43 43
 	FluxHelmReleaseExpansion
44 44
 }
45 45
 
@@ -50,7 +50,7 @@ type fluxHelmReleases struct {
50 50
 }
51 51
 
52 52
 // newFluxHelmReleases returns a FluxHelmReleases
53
-func newFluxHelmReleases(c *HelmV1alphaClient, namespace string) *fluxHelmReleases {
53
+func newFluxHelmReleases(c *HelmV1alpha2Client, namespace string) *fluxHelmReleases {
54 54
 	return &fluxHelmReleases{
55 55
 		client: c.RESTClient(),
56 56
 		ns:     namespace,
@@ -58,8 +58,8 @@ func newFluxHelmReleases(c *HelmV1alphaClient, namespace string) *fluxHelmReleas
58 58
 }
59 59
 
60 60
 // Get takes name of the fluxHelmRelease, and returns the corresponding fluxHelmRelease object, and an error if there is any.
61
-func (c *fluxHelmReleases) Get(name string, options v1.GetOptions) (result *v1alpha.FluxHelmRelease, err error) {
62
-	result = &v1alpha.FluxHelmRelease{}
61
+func (c *fluxHelmReleases) Get(name string, options v1.GetOptions) (result *v1alpha2.FluxHelmRelease, err error) {
62
+	result = &v1alpha2.FluxHelmRelease{}
63 63
 	err = c.client.Get().
64 64
 		Namespace(c.ns).
65 65
 		Resource("fluxhelmreleases").
@@ -71,8 +71,8 @@ func (c *fluxHelmReleases) Get(name string, options v1.GetOptions) (result *v1al
71 71
 }
72 72
 
73 73
 // List takes label and field selectors, and returns the list of FluxHelmReleases that match those selectors.
74
-func (c *fluxHelmReleases) List(opts v1.ListOptions) (result *v1alpha.FluxHelmReleaseList, err error) {
75
-	result = &v1alpha.FluxHelmReleaseList{}
74
+func (c *fluxHelmReleases) List(opts v1.ListOptions) (result *v1alpha2.FluxHelmReleaseList, err error) {
75
+	result = &v1alpha2.FluxHelmReleaseList{}
76 76
 	err = c.client.Get().
77 77
 		Namespace(c.ns).
78 78
 		Resource("fluxhelmreleases").
@@ -93,8 +93,8 @@ func (c *fluxHelmReleases) Watch(opts v1.ListOptions) (watch.Interface, error) {
93 93
 }
94 94
 
95 95
 // Create takes the representation of a fluxHelmRelease and creates it.  Returns the server's representation of the fluxHelmRelease, and an error, if there is any.
96
-func (c *fluxHelmReleases) Create(fluxHelmRelease *v1alpha.FluxHelmRelease) (result *v1alpha.FluxHelmRelease, err error) {
97
-	result = &v1alpha.FluxHelmRelease{}
96
+func (c *fluxHelmReleases) Create(fluxHelmRelease *v1alpha2.FluxHelmRelease) (result *v1alpha2.FluxHelmRelease, err error) {
97
+	result = &v1alpha2.FluxHelmRelease{}
98 98
 	err = c.client.Post().
99 99
 		Namespace(c.ns).
100 100
 		Resource("fluxhelmreleases").
@@ -105,8 +105,8 @@ func (c *fluxHelmReleases) Create(fluxHelmRelease *v1alpha.FluxHelmRelease) (res
105 105
 }
106 106
 
107 107
 // Update takes the representation of a fluxHelmRelease and updates it. Returns the server's representation of the fluxHelmRelease, and an error, if there is any.
108
-func (c *fluxHelmReleases) Update(fluxHelmRelease *v1alpha.FluxHelmRelease) (result *v1alpha.FluxHelmRelease, err error) {
109
-	result = &v1alpha.FluxHelmRelease{}
108
+func (c *fluxHelmReleases) Update(fluxHelmRelease *v1alpha2.FluxHelmRelease) (result *v1alpha2.FluxHelmRelease, err error) {
109
+	result = &v1alpha2.FluxHelmRelease{}
110 110
 	err = c.client.Put().
111 111
 		Namespace(c.ns).
112 112
 		Resource("fluxhelmreleases").
@@ -140,8 +140,8 @@ func (c *fluxHelmReleases) DeleteCollection(options *v1.DeleteOptions, listOptio
140 140
 }
141 141
 
142 142
 // Patch applies the patch and returns the patched fluxHelmRelease.
143
-func (c *fluxHelmReleases) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha.FluxHelmRelease, err error) {
144
-	result = &v1alpha.FluxHelmRelease{}
143
+func (c *fluxHelmReleases) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha2.FluxHelmRelease, err error) {
144
+	result = &v1alpha2.FluxHelmRelease{}
145 145
 	err = c.client.Patch(pt).
146 146
 		Namespace(c.ns).
147 147
 		Resource("fluxhelmreleases").

integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/generated_expansion.go → integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/generated_expansion.go View File

@@ -13,6 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 13
 See the License for the specific language governing permissions and
14 14
 limitations under the License.
15 15
 */
16
-package v1alpha
16
+package v1alpha2
17 17
 
18 18
 type FluxHelmReleaseExpansion interface{}

integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha/helm.integrations.flux.weave.works_client.go → integrations/client/clientset/versioned/typed/helm.integrations.flux.weave.works/v1alpha2/helm.integrations.flux.weave.works_client.go View File

@@ -13,31 +13,31 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 13
 See the License for the specific language governing permissions and
14 14
 limitations under the License.
15 15
 */
16
-package v1alpha
16
+package v1alpha2
17 17
 
18 18
 import (
19
-	v1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
19
+	v1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
20 20
 	"github.com/weaveworks/flux/integrations/client/clientset/versioned/scheme"
21 21
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
22 22
 	rest "k8s.io/client-go/rest"
23 23
 )
24 24
 
25
-type HelmV1alphaInterface interface {
25
+type HelmV1alpha2Interface interface {
26 26
 	RESTClient() rest.Interface
27 27
 	FluxHelmReleasesGetter
28 28
 }
29 29
 
30
-// HelmV1alphaClient is used to interact with features provided by the helm.integrations.flux.weave.works group.
31
-type HelmV1alphaClient struct {
30
+// HelmV1alpha2Client is used to interact with features provided by the helm.integrations.flux.weave.works group.
31
+type HelmV1alpha2Client struct {
32 32
 	restClient rest.Interface
33 33
 }
34 34
 
35
-func (c *HelmV1alphaClient) FluxHelmReleases(namespace string) FluxHelmReleaseInterface {
35
+func (c *HelmV1alpha2Client) FluxHelmReleases(namespace string) FluxHelmReleaseInterface {
36 36
 	return newFluxHelmReleases(c, namespace)
37 37
 }
38 38
 
39
-// NewForConfig creates a new HelmV1alphaClient for the given config.
40
-func NewForConfig(c *rest.Config) (*HelmV1alphaClient, error) {
39
+// NewForConfig creates a new HelmV1alpha2Client for the given config.
40
+func NewForConfig(c *rest.Config) (*HelmV1alpha2Client, error) {
41 41
 	config := *c
42 42
 	if err := setConfigDefaults(&config); err != nil {
43 43
 		return nil, err
@@ -46,12 +46,12 @@ func NewForConfig(c *rest.Config) (*HelmV1alphaClient, error) {
46 46
 	if err != nil {
47 47
 		return nil, err
48 48
 	}
49
-	return &HelmV1alphaClient{client}, nil
49
+	return &HelmV1alpha2Client{client}, nil
50 50
 }
51 51
 
52
-// NewForConfigOrDie creates a new HelmV1alphaClient for the given config and
52
+// NewForConfigOrDie creates a new HelmV1alpha2Client for the given config and
53 53
 // panics if there is an error in the config.
54
-func NewForConfigOrDie(c *rest.Config) *HelmV1alphaClient {
54
+func NewForConfigOrDie(c *rest.Config) *HelmV1alpha2Client {
55 55
 	client, err := NewForConfig(c)
56 56
 	if err != nil {
57 57
 		panic(err)
@@ -59,13 +59,13 @@ func NewForConfigOrDie(c *rest.Config) *HelmV1alphaClient {
59 59
 	return client
60 60
 }
61 61
 
62
-// New creates a new HelmV1alphaClient for the given RESTClient.
63
-func New(c rest.Interface) *HelmV1alphaClient {
64
-	return &HelmV1alphaClient{c}
62
+// New creates a new HelmV1alpha2Client for the given RESTClient.
63
+func New(c rest.Interface) *HelmV1alpha2Client {
64
+	return &HelmV1alpha2Client{c}
65 65
 }
66 66
 
67 67
 func setConfigDefaults(config *rest.Config) error {
68
-	gv := v1alpha.SchemeGroupVersion
68
+	gv := v1alpha2.SchemeGroupVersion
69 69
 	config.GroupVersion = &gv
70 70
 	config.APIPath = "/apis"
71 71
 	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
@@ -79,7 +79,7 @@ func setConfigDefaults(config *rest.Config) error {
79 79
 
80 80
 // RESTClient returns a RESTClient that is used to communicate
81 81
 // with API server by this client implementation.
82
-func (c *HelmV1alphaClient) RESTClient() rest.Interface {
82
+func (c *HelmV1alpha2Client) RESTClient() rest.Interface {
83 83
 	if c == nil {
84 84
 		return nil
85 85
 	}

+ 4
- 4
integrations/client/informers/externalversions/generic.go View File

@@ -20,7 +20,7 @@ package externalversions
20 20
 
21 21
 import (
22 22
 	"fmt"
23
-	v1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
23
+	v1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
24 24
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
25 25
 	cache "k8s.io/client-go/tools/cache"
26 26
 )
@@ -51,9 +51,9 @@ func (f *genericInformer) Lister() cache.GenericLister {
51 51
 // TODO extend this to unknown resources with a client pool
52 52
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
53 53
 	switch resource {
54
-	// Group=helm.integrations.flux.weave.works, Version=v1alpha
55
-	case v1alpha.SchemeGroupVersion.WithResource("fluxhelmreleases"):
56
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Helm().V1alpha().FluxHelmReleases().Informer()}, nil
54
+	// Group=helm.integrations.flux.weave.works, Version=v1alpha2
55
+	case v1alpha2.SchemeGroupVersion.WithResource("fluxhelmreleases"):
56
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Helm().V1alpha2().FluxHelmReleases().Informer()}, nil
57 57
 
58 58
 	}
59 59
 

+ 6
- 6
integrations/client/informers/externalversions/helm.integrations.flux.weave.works/interface.go View File

@@ -19,14 +19,14 @@ limitations under the License.
19 19
 package helm
20 20
 
21 21
 import (
22
-	v1alpha "github.com/weaveworks/flux/integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha"
22
+	v1alpha2 "github.com/weaveworks/flux/integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha2"
23 23
 	internalinterfaces "github.com/weaveworks/flux/integrations/client/informers/externalversions/internalinterfaces"
24 24
 )
25 25
 
26 26
 // Interface provides access to each of this group's versions.
27 27
 type Interface interface {
28
-	// V1alpha provides access to shared informers for resources in V1alpha.
29
-	V1alpha() v1alpha.Interface
28
+	// V1alpha2 provides access to shared informers for resources in V1alpha2.
29
+	V1alpha2() v1alpha2.Interface
30 30
 }
31 31
 
32 32
 type group struct {
@@ -40,7 +40,7 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList
40 40
 	return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions}
41 41
 }
42 42
 
43
-// V1alpha returns a new v1alpha.Interface.
44
-func (g *group) V1alpha() v1alpha.Interface {
45
-	return v1alpha.New(g.factory, g.namespace, g.tweakListOptions)
43
+// V1alpha2 returns a new v1alpha2.Interface.
44
+func (g *group) V1alpha2() v1alpha2.Interface {
45
+	return v1alpha2.New(g.factory, g.namespace, g.tweakListOptions)
46 46
 }

integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha/fluxhelmrelease.go → integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha2/fluxhelmrelease.go View File

@@ -16,13 +16,13 @@ limitations under the License.
16 16
 
17 17
 // This file was automatically generated by informer-gen
18 18
 
19
-package v1alpha
19
+package v1alpha2
20 20
 
21 21
 import (
22
-	helm_integrations_flux_weave_works_v1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
22
+	helm_integrations_flux_weave_works_v1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
23 23
 	versioned "github.com/weaveworks/flux/integrations/client/clientset/versioned"
24 24
 	internalinterfaces "github.com/weaveworks/flux/integrations/client/informers/externalversions/internalinterfaces"
25
-	v1alpha "github.com/weaveworks/flux/integrations/client/listers/helm.integrations.flux.weave.works/v1alpha"
25
+	v1alpha2 "github.com/weaveworks/flux/integrations/client/listers/helm.integrations.flux.weave.works/v1alpha2"
26 26
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27 27
 	runtime "k8s.io/apimachinery/pkg/runtime"
28 28
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -34,7 +34,7 @@ import (
34 34
 // FluxHelmReleases.
35 35
 type FluxHelmReleaseInformer interface {
36 36
 	Informer() cache.SharedIndexInformer
37
-	Lister() v1alpha.FluxHelmReleaseLister
37
+	Lister() v1alpha2.FluxHelmReleaseLister
38 38
 }
39 39
 
40 40
 type fluxHelmReleaseInformer struct {
@@ -60,16 +60,16 @@ func NewFilteredFluxHelmReleaseInformer(client versioned.Interface, namespace st
60 60
 				if tweakListOptions != nil {
61 61
 					tweakListOptions(&options)
62 62
 				}
63
-				return client.HelmV1alpha().FluxHelmReleases(namespace).List(options)
63
+				return client.HelmV1alpha2().FluxHelmReleases(namespace).List(options)
64 64
 			},
65 65
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
66 66
 				if tweakListOptions != nil {
67 67
 					tweakListOptions(&options)
68 68
 				}
69
-				return client.HelmV1alpha().FluxHelmReleases(namespace).Watch(options)
69
+				return client.HelmV1alpha2().FluxHelmReleases(namespace).Watch(options)
70 70
 			},
71 71
 		},
72
-		&helm_integrations_flux_weave_works_v1alpha.FluxHelmRelease{},
72
+		&helm_integrations_flux_weave_works_v1alpha2.FluxHelmRelease{},
73 73
 		resyncPeriod,
74 74
 		indexers,
75 75
 	)
@@ -80,9 +80,9 @@ func (f *fluxHelmReleaseInformer) defaultInformer(client versioned.Interface, re
80 80
 }
81 81
 
82 82
 func (f *fluxHelmReleaseInformer) Informer() cache.SharedIndexInformer {
83
-	return f.factory.InformerFor(&helm_integrations_flux_weave_works_v1alpha.FluxHelmRelease{}, f.defaultInformer)
83
+	return f.factory.InformerFor(&helm_integrations_flux_weave_works_v1alpha2.FluxHelmRelease{}, f.defaultInformer)
84 84
 }
85 85
 
86
-func (f *fluxHelmReleaseInformer) Lister() v1alpha.FluxHelmReleaseLister {
87
-	return v1alpha.NewFluxHelmReleaseLister(f.Informer().GetIndexer())
86
+func (f *fluxHelmReleaseInformer) Lister() v1alpha2.FluxHelmReleaseLister {
87
+	return v1alpha2.NewFluxHelmReleaseLister(f.Informer().GetIndexer())
88 88
 }

integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha/interface.go → integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha2/interface.go View File

@@ -16,7 +16,7 @@ limitations under the License.
16 16
 
17 17
 // This file was automatically generated by informer-gen
18 18
 
19
-package v1alpha
19
+package v1alpha2
20 20
 
21 21
 import (
22 22
 	internalinterfaces "github.com/weaveworks/flux/integrations/client/informers/externalversions/internalinterfaces"

integrations/client/listers/helm.integrations.flux.weave.works/v1alpha/expansion_generated.go → integrations/client/listers/helm.integrations.flux.weave.works/v1alpha2/expansion_generated.go View File

@@ -16,7 +16,7 @@ limitations under the License.
16 16
 
17 17
 // This file was automatically generated by lister-gen
18 18
 
19
-package v1alpha
19
+package v1alpha2
20 20
 
21 21
 // FluxHelmReleaseListerExpansion allows custom methods to be added to
22 22
 // FluxHelmReleaseLister.

integrations/client/listers/helm.integrations.flux.weave.works/v1alpha/fluxhelmrelease.go → integrations/client/listers/helm.integrations.flux.weave.works/v1alpha2/fluxhelmrelease.go View File

@@ -16,10 +16,10 @@ limitations under the License.
16 16
 
17 17
 // This file was automatically generated by lister-gen
18 18
 
19
-package v1alpha
19
+package v1alpha2
20 20
 
21 21
 import (
22
-	v1alpha "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
22
+	v1alpha2 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
23 23
 	"k8s.io/apimachinery/pkg/api/errors"
24 24
 	"k8s.io/apimachinery/pkg/labels"
25 25
 	"k8s.io/client-go/tools/cache"
@@ -28,7 +28,7 @@ import (
28 28
 // FluxHelmReleaseLister helps list FluxHelmReleases.
29 29
 type FluxHelmReleaseLister interface {
30 30
 	// List lists all FluxHelmReleases in the indexer.
31
-	List(selector labels.Selector) (ret []*v1alpha.FluxHelmRelease, err error)
31
+	List(selector labels.Selector) (ret []*v1alpha2.FluxHelmRelease, err error)
32 32
 	// FluxHelmReleases returns an object that can list and get FluxHelmReleases.
33 33
 	FluxHelmReleases(namespace string) FluxHelmReleaseNamespaceLister
34 34
 	FluxHelmReleaseListerExpansion
@@ -45,9 +45,9 @@ func NewFluxHelmReleaseLister(indexer cache.Indexer) FluxHelmReleaseLister {
45 45
 }
46 46
 
47 47
 // List lists all FluxHelmReleases in the indexer.
48
-func (s *fluxHelmReleaseLister) List(selector labels.Selector) (ret []*v1alpha.FluxHelmRelease, err error) {
48
+func (s *fluxHelmReleaseLister) List(selector labels.Selector) (ret []*v1alpha2.FluxHelmRelease, err error) {
49 49
 	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
50
-		ret = append(ret, m.(*v1alpha.FluxHelmRelease))
50
+		ret = append(ret, m.(*v1alpha2.FluxHelmRelease))
51 51
 	})
52 52
 	return ret, err
53 53
 }
@@ -60,9 +60,9 @@ func (s *fluxHelmReleaseLister) FluxHelmReleases(namespace string) FluxHelmRelea
60 60
 // FluxHelmReleaseNamespaceLister helps list and get FluxHelmReleases.
61 61
 type FluxHelmReleaseNamespaceLister interface {
62 62
 	// List lists all FluxHelmReleases in the indexer for a given namespace.
63
-	List(selector labels.Selector) (ret []*v1alpha.FluxHelmRelease, err error)
63
+	List(selector labels.Selector) (ret []*v1alpha2.FluxHelmRelease, err error)
64 64
 	// Get retrieves the FluxHelmRelease from the indexer for a given namespace and name.
65
-	Get(name string) (*v1alpha.FluxHelmRelease, error)
65
+	Get(name string) (*v1alpha2.FluxHelmRelease, error)
66 66
 	FluxHelmReleaseNamespaceListerExpansion
67 67
 }
68 68
 
@@ -74,21 +74,21 @@ type fluxHelmReleaseNamespaceLister struct {
74 74
 }
75 75
 
76 76
 // List lists all FluxHelmReleases in the indexer for a given namespace.
77
-func (s fluxHelmReleaseNamespaceLister) List(selector labels.Selector) (ret []*v1alpha.FluxHelmRelease, err error) {
77
+func (s fluxHelmReleaseNamespaceLister) List(selector labels.Selector) (ret []*v1alpha2.FluxHelmRelease, err error) {
78 78
 	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
79
-		ret = append(ret, m.(*v1alpha.FluxHelmRelease))
79
+		ret = append(ret, m.(*v1alpha2.FluxHelmRelease))
80 80
 	})
81 81
 	return ret, err
82 82
 }
83 83
 
84 84
 // Get retrieves the FluxHelmRelease from the indexer for a given namespace and name.
85
-func (s fluxHelmReleaseNamespaceLister) Get(name string) (*v1alpha.FluxHelmRelease, error) {
85
+func (s fluxHelmReleaseNamespaceLister) Get(name string) (*v1alpha2.FluxHelmRelease, error) {
86 86
 	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
87 87
 	if err != nil {
88 88
 		return nil, err
89 89
 	}
90 90
 	if !exists {
91
-		return nil, errors.NewNotFound(v1alpha.Resource("fluxhelmrelease"), name)
91
+		return nil, errors.NewNotFound(v1alpha2.Resource("fluxhelmrelease"), name)
92 92
 	}
93
-	return obj.(*v1alpha.FluxHelmRelease), nil
93
+	return obj.(*v1alpha2.FluxHelmRelease), nil
94 94
 }

+ 2
- 2
integrations/helm/chartsync/chartsync.go View File

@@ -25,7 +25,7 @@ import (
25 25
 	"k8s.io/apimachinery/pkg/util/runtime"
26 26
 	"k8s.io/client-go/kubernetes"
27 27
 
28
-	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
28
+	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
29 29
 	ifclientset "github.com/weaveworks/flux/integrations/client/clientset/versioned"
30 30
 	helmgit "github.com/weaveworks/flux/integrations/helm/git"
31 31
 	chartrelease "github.com/weaveworks/flux/integrations/helm/release"
@@ -287,7 +287,7 @@ func (chs *ChartChangeSync) getCustomResources(namespaces []string, chart string
287 287
 
288 288
 	fhrs := []ifv1.FluxHelmRelease{}
289 289
 	for _, ns := range namespaces {
290
-		list, err := chs.ifClient.HelmV1alpha().FluxHelmReleases(ns).List(listOptions)
290
+		list, err := chs.ifClient.HelmV1alpha2().FluxHelmReleases(ns).List(listOptions)
291 291
 		if err != nil {
292 292
 			chs.logger.Log("error", fmt.Errorf("Failure while retrieving FluxHelmReleases: %#v", err))
293 293
 			continue

+ 2
- 2
integrations/helm/customresource/customresource.go View File

@@ -1,11 +1,11 @@
1 1
 package customresource
2 2
 
3 3
 import (
4
-	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
4
+	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
5 5
 	ifclientset "github.com/weaveworks/flux/integrations/client/clientset/versioned"
6 6
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
7 7
 )
8 8
 
9 9
 func GetNSCustomResources(ifClient ifclientset.Clientset, ns string) (*ifv1.FluxHelmReleaseList, error) {
10
-	return ifClient.HelmV1alpha().FluxHelmReleases(ns).List(metav1.ListOptions{})
10
+	return ifClient.HelmV1alpha2().FluxHelmReleases(ns).List(metav1.ListOptions{})
11 11
 }

+ 3
- 3
integrations/helm/operator/operator.go View File

@@ -21,10 +21,10 @@ import (
21 21
 
22 22
 	"github.com/go-kit/kit/log"
23 23
 
24
-	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
24
+	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
25 25
 	ifscheme "github.com/weaveworks/flux/integrations/client/clientset/versioned/scheme"
26
-	fhrv1 "github.com/weaveworks/flux/integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha"
27
-	iflister "github.com/weaveworks/flux/integrations/client/listers/helm.integrations.flux.weave.works/v1alpha" // kubernetes 1.9
26
+	fhrv1 "github.com/weaveworks/flux/integrations/client/informers/externalversions/helm.integrations.flux.weave.works/v1alpha2"
27
+	iflister "github.com/weaveworks/flux/integrations/client/listers/helm.integrations.flux.weave.works/v1alpha2"
28 28
 	helmgit "github.com/weaveworks/flux/integrations/helm/git"
29 29
 	chartrelease "github.com/weaveworks/flux/integrations/helm/release"
30 30
 )

+ 1
- 1
integrations/helm/release/release.go View File

@@ -11,7 +11,7 @@ import (
11 11
 	hapi_release "k8s.io/helm/pkg/proto/hapi/release"
12 12
 
13 13
 	"github.com/go-kit/kit/log"
14
-	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
14
+	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
15 15
 	helmgit "github.com/weaveworks/flux/integrations/helm/git"
16 16
 )
17 17
 

+ 1
- 1
integrations/helm/releasesync/releasesync.go View File

@@ -17,7 +17,7 @@ import (
17 17
 
18 18
 	"github.com/go-kit/kit/log"
19 19
 
20
-	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
20
+	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
21 21
 	ifclientset "github.com/weaveworks/flux/integrations/client/clientset/versioned"
22 22
 	"github.com/weaveworks/flux/integrations/helm/customresource"
23 23
 	helmgit "github.com/weaveworks/flux/integrations/helm/git"

+ 1
- 1
integrations/helm/releasesync/utils.go View File

@@ -1,7 +1,7 @@
1 1
 package releasesync
2 2
 
3 3
 import (
4
-	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha"
4
+	ifv1 "github.com/weaveworks/flux/apis/helm.integrations.flux.weave.works/v1alpha2"
5 5
 	"github.com/weaveworks/flux/integrations/helm/release"
6 6
 )
7 7
 

+ 1
- 1
site/helm/helm-integration-requirements.md View File

@@ -20,7 +20,7 @@ menu_order: 20
20 20
 
21 21
 ```
22 22
 ---
23
-  apiVersion: helm.integrations.flux.weave.works/v1alpha
23
+  apiVersion: helm.integrations.flux.weave.works/v1alpha2
24 24
   kind: FluxHelmRelease
25 25
   metadata:
26 26
     name: mongodb

+ 1
- 1
site/helm/helm-integration.md View File

@@ -33,7 +33,7 @@ Flux-Helm Integration implementation consists of two parts:
33 33
  - Example of Custom Resource manifest:
34 34
  ```
35 35
 ---
36
-  apiVersion: helm.integrations.flux.weave.works/v1alpha
36
+  apiVersion: helm.integrations.flux.weave.works/v1alpha2
37 37
   kind: FluxHelmRelease
38 38
   metadata:
39 39
     name: mongodb

Loading…
Cancel
Save