Merge pull request #99 from fluxcd/api/v0.1.0

Promote the helm.toolkit.fluxcd.io API to v2beta1
fluxcd · Sep 30, 2020 · 77399d5 · 77399d5
2 parents 9e3760a + accd476
commit 77399d5
Show file tree

Hide file tree

Showing 55 changed files with 1,087 additions and 167 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2-beta
         with:
-          go-version: 1.14.x
+          go-version: 1.15.x
       - name: Setup Kubernetes
         uses: engineerd/[email protected]
       - name: Setup Helm

diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "^1.14.x"
+          go-version: "^1.15.x"
       - run: go version
       # Runs a set of commands to initialize and analyze with FOSSA
       - name: run FOSSA analysis

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Docker buildkit multi-arch build requires golang alpine
-FROM golang:1.14-alpine as builder
+FROM golang:1.15-alpine as builder
 
 WORKDIR /workspace
 

diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ manifests: controller-gen
 
 # Generate API reference documentation
 api-docs: gen-crd-api-reference-docs
-	$(API_REF_GEN) -api-dir=./api/v2alpha1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/helmrelease.md
+	$(API_REF_GEN) -api-dir=./api/v2beta1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/helmrelease.md
 
 # Run go fmt against code
 fmt:

diff --git a/PROJECT b/PROJECT
@@ -3,5 +3,5 @@ repo: github.com/fluxcd/helm-controller
 resources:
 - group: helm
   kind: HelmRelease
-  version: v2alpha1
+  version: v2beta1
 version: "2"
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ operator.
 
 ## Specifications
 
-* [API](docs/spec/v2alpha1/README.md)
+* [API](docs/spec/v2beta1/README.md)
 * [Controller](docs/spec/README.md)
 
 [source-controller]: https://github.com/fluxcd/source-controller

diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/helm-controller/api
 
-go 1.14
+go 1.15
 
 require (
 	github.com/fluxcd/pkg/apis/meta v0.0.2

diff --git a/api/v2alpha1/condition_types.go → api/v2beta1/condition_types.go b/api/v2alpha1/condition_types.go → api/v2beta1/condition_types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha1
+package v2beta1
 
 const (
 	// ReleasedCondition represents the status of the last release attempt

diff --git a/api/v2alpha1/doc.go → api/v2beta1/doc.go b/api/v2alpha1/doc.go → api/v2beta1/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v2alpha1 contains API Schema definitions for the helm v2alpha1 API group
+// Package v2beta1 contains API Schema definitions for the helm v2beta1 API group
 // +kubebuilder:object:generate=true
 // +groupName=helm.toolkit.fluxcd.io
-package v2alpha1
+package v2beta1
diff --git a/api/v2alpha1/groupversion_info.go → api/v2beta1/groupversion_info.go b/api/v2alpha1/groupversion_info.go → api/v2beta1/groupversion_info.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha1
+package v2beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -23,7 +23,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "helm.toolkit.fluxcd.io", Version: "v2alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "helm.toolkit.fluxcd.io", Version: "v2beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v2alpha1/helmrelease_types.go → api/v2beta1/helmrelease_types.go b/api/v2alpha1/helmrelease_types.go → api/v2beta1/helmrelease_types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha1
+package v2beta1
 
 import (
 	"encoding/json"
@@ -35,7 +35,7 @@ const HelmReleaseFinalizer = "finalizers.fluxcd.io"
 
 // HelmReleaseSpec defines the desired state of a Helm release.
 type HelmReleaseSpec struct {
-	// Chart defines the template of the v1alpha1.HelmChart that should be created
+	// Chart defines the template of the v1beta1.HelmChart that should be created
 	// for this HelmRelease.
 	// +required
 	Chart HelmChartTemplate `json:"chart"`
@@ -155,31 +155,31 @@ func (in HelmReleaseSpec) GetUninstall() Uninstall {
 }
 
 // HelmChartTemplate defines the template from which the controller will
-// generate a v1alpha1.HelmChart object in the same namespace as the referenced
-// v1alpha1.Source.
+// generate a v1beta1.HelmChart object in the same namespace as the referenced
+// v1beta1.Source.
 type HelmChartTemplate struct {
-	// Spec holds the template for the v1alpha1.HelmChartSpec for this HelmRelease.
+	// Spec holds the template for the v1beta1.HelmChartSpec for this HelmRelease.
 	// +required
 	Spec HelmChartTemplateSpec `json:"spec"`
 }
 
 // HelmChartTemplateSpec defines the template from which the controller will
-// generate a v1alpha1.HelmChartSpec object.
+// generate a v1beta1.HelmChartSpec object.
 type HelmChartTemplateSpec struct {
 	// The name or path the Helm chart is available at in the SourceRef.
 	// +required
 	Chart string `json:"chart"`
 
-	// Version semver expression, ignored for charts from v1alpha1.GitRepository and
-	// v1alpha1.Bucket sources. Defaults to latest when omitted.
+	// Version semver expression, ignored for charts from v1beta1.GitRepository and
+	// v1beta1.Bucket sources. Defaults to latest when omitted.
 	// +optional
 	Version string `json:"version,omitempty"`
 
-	// The name and namespace of the v1alpha1.Source the chart is available at.
+	// The name and namespace of the v1beta1.Source the chart is available at.
 	// +required
 	SourceRef CrossNamespaceObjectReference `json:"sourceRef"`
 
-	// Interval at which to check the v1alpha1.Source for updates. Defaults to
+	// Interval at which to check the v1beta1.Source for updates. Defaults to
 	// 'HelmReleaseSpec.Interval'.
 	// +optional
 	Interval *metav1.Duration `json:"interval,omitempty"`
@@ -190,7 +190,7 @@ type HelmChartTemplateSpec struct {
 	ValuesFile string `json:"valuesFile,omitempty"`
 }
 
-// GetInterval returns the configured interval for the v1alpha1.HelmChart,
+// GetInterval returns the configured interval for the v1beta1.HelmChart,
 // or the given default.
 func (in HelmChartTemplate) GetInterval(defaultInterval metav1.Duration) metav1.Duration {
 	if in.Spec.Interval == nil {
@@ -200,7 +200,7 @@ func (in HelmChartTemplate) GetInterval(defaultInterval metav1.Duration) metav1.
 }
 
 // GetNamespace returns the namespace targeted namespace for the
-// v1alpha1.HelmChart, or the given default.
+// v1beta1.HelmChart, or the given default.
 func (in HelmChartTemplate) GetNamespace(defaultNamespace string) string {
 	if in.Spec.SourceRef.Namespace == "" {
 		return defaultNamespace

diff --git a/api/v2alpha1/reference_types.go → api/v2beta1/reference_types.go b/api/v2alpha1/reference_types.go → api/v2beta1/reference_types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha1
+package v2beta1
 
 // CrossNamespaceObjectReference contains enough information to let you locate
 // the typed referenced object at cluster level.

diff --git a/api/v2alpha1/zz_generated.deepcopy.go → api/v2beta1/zz_generated.deepcopy.go b/api/v2alpha1/zz_generated.deepcopy.go → api/v2beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
@@ -28,7 +28,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v2alpha1
+    name: v2beta1
     schema:
       openAPIV3Schema:
         description: HelmRelease is the Schema for the helmreleases API
@@ -49,23 +49,23 @@ spec:
             description: HelmReleaseSpec defines the desired state of a Helm release.
             properties:
               chart:
-                description: Chart defines the template of the v1alpha1.HelmChart
-                  that should be created for this HelmRelease.
+                description: Chart defines the template of the v1beta1.HelmChart that
+                  should be created for this HelmRelease.
                 properties:
                   spec:
-                    description: Spec holds the template for the v1alpha1.HelmChartSpec
+                    description: Spec holds the template for the v1beta1.HelmChartSpec
                       for this HelmRelease.
                     properties:
                       chart:
                         description: The name or path the Helm chart is available
                           at in the SourceRef.
                         type: string
                       interval:
-                        description: Interval at which to check the v1alpha1.Source
+                        description: Interval at which to check the v1beta1.Source
                           for updates. Defaults to 'HelmReleaseSpec.Interval'.
                         type: string
                       sourceRef:
-                        description: The name and namespace of the v1alpha1.Source
+                        description: The name and namespace of the v1beta1.Source
                           the chart is available at.
                         properties:
                           apiVersion:
@@ -98,8 +98,8 @@ spec:
                         type: string
                       version:
                         description: Version semver expression, ignored for charts
-                          from v1alpha1.GitRepository and v1alpha1.Bucket sources.
-                          Defaults to latest when omitted.
+                          from v1beta1.GitRepository and v1beta1.Bucket sources. Defaults
+                          to latest when omitted.
                         type: string
                     required:
                     - chart

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -5,6 +5,6 @@ resources:
 - ../crd
 - ../rbac
 - ../manager
-- github.com/fluxcd/source-controller/config//crd?ref=v0.0.15
-- github.com/fluxcd/source-controller/config//manager?ref=v0.0.15
+- github.com/fluxcd/source-controller/config//crd?ref=v0.1.0
+- github.com/fluxcd/source-controller/config//manager?ref=v0.1.0
 - namespace.yaml
diff --git a/...m_v2alpha1_helmrelease_gitrepository.yaml → ...lm_v2beta1_helmrelease_gitrepository.yaml b/...m_v2alpha1_helmrelease_gitrepository.yaml → ...lm_v2beta1_helmrelease_gitrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: podinfo-gitrepository

diff --git a/..._v2alpha1_helmrelease_helmrepository.yaml → ...m_v2beta1_helmrelease_helmrepository.yaml b/..._v2alpha1_helmrelease_helmrepository.yaml → ...m_v2beta1_helmrelease_helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: podinfo-helmrepository

diff --git a/...amples/source_v1alpha1_gitrepository.yaml → ...samples/source_v1beta1_gitrepository.yaml b/...amples/source_v1alpha1_gitrepository.yaml → ...samples/source_v1beta1_gitrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1alpha1
+apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
   name: podinfo

diff --git a/...mples/source_v1alpha1_helmrepository.yaml → ...amples/source_v1beta1_helmrepository.yaml b/...mples/source_v1alpha1_helmrepository.yaml → ...amples/source_v1beta1_helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1alpha1
+apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: podinfo

diff --git a/config/testdata/dependencies/helmrelease-backend.yaml b/config/testdata/dependencies/helmrelease-backend.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: backend

diff --git a/config/testdata/dependencies/helmrelease-frontend.yaml b/config/testdata/dependencies/helmrelease-frontend.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: frontend

diff --git a/config/testdata/dependencies/helmrepository.yaml b/config/testdata/dependencies/helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1alpha1
+apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: webapp

diff --git a/config/testdata/install-fail-remediate/helmrelease.yaml b/config/testdata/install-fail-remediate/helmrelease.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: install-fail-remediate

diff --git a/config/testdata/install-fail-retry/helmrelease.yaml b/config/testdata/install-fail-retry/helmrelease.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: install-fail-retry

diff --git a/config/testdata/install-fail/helmrelease.yaml b/config/testdata/install-fail/helmrelease.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: install-fail

diff --git a/config/testdata/install-test-fail-ignore/helmrelease.yaml b/config/testdata/install-test-fail-ignore/helmrelease.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: install-test-fail-ignore

diff --git a/config/testdata/install-test-fail/helmrelease.yaml b/config/testdata/install-test-fail/helmrelease.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: install-test-fail

diff --git a/config/testdata/podinfo/gitrepository.yaml b/config/testdata/podinfo/gitrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1alpha1
+apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
   name: podinfo

diff --git a/config/testdata/podinfo/helmrelease-git.yaml b/config/testdata/podinfo/helmrelease-git.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: podinfo-git

diff --git a/config/testdata/podinfo/helmrelease.yaml b/config/testdata/podinfo/helmrelease.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: podinfo

diff --git a/config/testdata/podinfo/helmrepository.yaml b/config/testdata/podinfo/helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1alpha1
+apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: podinfo

diff --git a/config/testdata/upgrade-fail-remediate-uninstall/install.yaml b/config/testdata/upgrade-fail-remediate-uninstall/install.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate-uninstall

diff --git a/config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml b/config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate-uninstall

diff --git a/config/testdata/upgrade-fail-remediate/install.yaml b/config/testdata/upgrade-fail-remediate/install.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate

diff --git a/config/testdata/upgrade-fail-remediate/upgrade.yaml b/config/testdata/upgrade-fail-remediate/upgrade.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate

diff --git a/config/testdata/upgrade-fail-retry/install.yaml b/config/testdata/upgrade-fail-retry/install.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail-retry

diff --git a/config/testdata/upgrade-fail-retry/upgrade.yaml b/config/testdata/upgrade-fail-retry/upgrade.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail-retry

diff --git a/config/testdata/upgrade-fail/install.yaml b/config/testdata/upgrade-fail/install.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail

diff --git a/config/testdata/upgrade-fail/upgrade.yaml b/config/testdata/upgrade-fail/upgrade.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-fail

diff --git a/config/testdata/upgrade-test-fail/install.yaml b/config/testdata/upgrade-test-fail/install.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: upgrade-test-fail