fix:update crd version in helm chart (#19)

* fix:update crd version in helm chart

* fix:update crd version in folder

* refactor: remove the import aliases as they are not needed thereby reducing maintenance with every upgrade

* refactor: upgrading the version on samples and comments that were missed in the last commit

Co-authored-by: Sangeetha Madamanchi <[email protected]>

Makefile

@@ -147,6 +147,7 @@ helmManifests: manifests kustomize kubernetes-split-yaml ## Create Helm Template
 	$(KUSTOMIZE) build config/helm-manifest >> charts/tmp.yaml
 	go run scripts/helm-charts/update.go
 	$(KUBERNETES_SPLIT_YAML) --outdir charts/overwhelm/templates charts/tmp.yaml
+	mv charts/overwhelm/templates/*-crd.yaml charts/overwhelm/crds
 	rm charts/tmp.yaml
 
 .PHONY: helmInstall

PROJECT

@@ -14,6 +14,6 @@ resources:
   domain: expediagroup.com
   group: core
   kind: Application
-  path: github.com/ExpediaGroup/overwhelm/api/v1alpha1
-  version: v1alpha1
+  path: github.com/ExpediaGroup/overwhelm/api/v1alpha2
+  version: v1alpha2
 version: "3"

api/v1alpha1/application_types.go → api/v1alpha2/application_types.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha1
+package v1alpha2
 
 import (
 	"fmt"

api/v1alpha1/groupversion_info.go → api/v1alpha2/groupversion_info.go

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package v1alpha1 contains API Schema definitions for the core v1alpha1 API group
+// Package v1alpha2contains API Schema definitions for the core v1alpha2 API group
 //+kubebuilder:object:generate=true
 //+groupName=core.expediagroup.com
-package v1alpha1
+//+versionName:=v1alpha2
+package v1alpha2
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -24,7 +25,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "core.expediagroup.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "core.expediagroup.com", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

api/v1alpha1/reference_types.go → api/v1alpha2/reference_types.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha1
+package v1alpha2
 
 // SourceReference is the reference of the source where the chart is available.
 // For e.g., the HelmRepository resource specifying where the helm chart is located

charts/overwhelm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: overwhelm
-version: 1.1.0
+version: 1.1.1
 maintainers:
     - name: "Expedia Group"
       url: "https://github.com/ExpediaGroup/overwhelm"

charts/overwhelm/templates/applications.core.expediagroup.com-crd.yaml → charts/overwhelm/crds/applications.core.expediagroup.com-crd.yaml

@@ -26,7 +26,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1alpha1
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         description: Application is the Schema for the applications API

config/crd/bases/core.expediagroup.com_applications.yaml

@@ -27,7 +27,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1alpha1
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         description: Application is the Schema for the applications API

config/samples/core_v1alpha1_application.yaml → config/samples/core_v1alpha2_application.yaml

@@ -1,6 +1,6 @@
 # This is a sample of the Application Resource that, when deployed in a cluster, triggers the
 # overwhelm operator to perform its reconciliation logic
-apiVersion: core.expediagroup.com/v1alpha1
+apiVersion: core.expediagroup.com/v1alpha2
 kind: Application
 metadata:
   name: application-sample

config/samples/full-example-application.yaml

@@ -7,7 +7,7 @@ spec:
   interval: 5m0s
   url: https://stefanprodan.github.io/podinfo
 ---
-apiVersion: core.expediagroup.com/v1alpha1
+apiVersion: core.expediagroup.com/v1alpha2
 kind: Application
 metadata:
   name: podinfo

config/samples/hr_app-sample.yaml

@@ -4,7 +4,7 @@ metadata:
   name: application-sample
   namespace: app-namespace
   ownerReferences:
-    - apiVersion: core.expediagroup.com/v1alpha1
+    - apiVersion: core.expediagroup.com/v1alpha2
       blockOwnerDeletion: true
       controller: true
       kind: Application

config/samples/kustomization.yaml

@@ -1,4 +1,4 @@
 ## Append samples you want in your CSV to this file as resources ##
 resources:
-- core_v1alpha1_application.yaml
+- core_v1alpha2_application.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples

controllers/application_controller.go

@@ -44,7 +44,7 @@ import (
 	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	v1 "github.com/ExpediaGroup/overwhelm/api/v1alpha1"
+	v1 "github.com/ExpediaGroup/overwhelm/api/v1alpha2"
 )
 
 // ApplicationReconciler reconciles an Application object

controllers/application_controller_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ExpediaGroup/overwhelm/api/v1alpha1"
+	"github.com/ExpediaGroup/overwhelm/api/v1alpha2"
 	"github.com/fluxcd/helm-controller/api/v2beta1"
 	"github.com/fluxcd/pkg/apis/meta"
 	. "github.com/onsi/ginkgo"
@@ -21,9 +21,9 @@ import (
 
 var ctx context.Context
 
-var application = &v1alpha1.Application{
+var application = &v1alpha2.Application{
 	TypeMeta: metav1.TypeMeta{
-		APIVersion: "core.expediagroup.com/v1alpha1",
+		APIVersion: "core.expediagroup.com/v1alpha2",
 		Kind:       "Application",
 	},
 	ObjectMeta: metav1.ObjectMeta{
@@ -32,9 +32,9 @@ var application = &v1alpha1.Application{
 			"test-my-label": "ok",
 		},
 	},
-	Spec: v1alpha1.ApplicationSpec{
-		Template: v1alpha1.ReleaseTemplate{
-			Metadata: v1alpha1.Metadata{
+	Spec: v1alpha2.ApplicationSpec{
+		Template: v1alpha2.ReleaseTemplate{
+			Metadata: v1alpha2.Metadata{
 				Labels: map[string]string{"test-temp-label": "ok"},
 			},
 			Spec: v2beta1.HelmReleaseSpec{
@@ -252,9 +252,9 @@ var _ = Describe("Application controller", func() {
 				}}
 				hr.SetConditions(conditions)
 				Expect(k8sClient.Status().Update(ctx, hr)).Should(BeNil())
-				app := &v1alpha1.Application{}
+				app := &v1alpha2.Application{}
 				Eventually(
-					func(ctx context.Context, key client.ObjectKey, app *v1alpha1.Application) func() error {
+					func(ctx context.Context, key client.ObjectKey, app *v1alpha2.Application) func() error {
 						return func() error {
 							if err := k8sClient.Get(ctx, key, app); err != nil {
 								return err
@@ -290,9 +290,9 @@ var _ = Describe("Application controller", func() {
 				}}
 				hr.SetConditions(conditions)
 				Expect(k8sClient.Status().Update(ctx, hr)).Should(BeNil())
-				app := &v1alpha1.Application{}
+				app := &v1alpha2.Application{}
 				Eventually(
-					func(ctx context.Context, app *v1alpha1.Application) func() error {
+					func(ctx context.Context, app *v1alpha2.Application) func() error {
 						return func() error {
 							if err := k8sClient.Get(ctx, client.ObjectKey{Name: a.Name, Namespace: a.Namespace}, app); err != nil {
 								return err
@@ -375,7 +375,7 @@ var _ = Describe("Application controller", func() {
 						}
 					}(ctx, p), 5*time.Second, 300*time.Millisecond).Should(BeNil())
 				Eventually(
-					func(ctx context.Context, app *v1alpha1.Application) func() error {
+					func(ctx context.Context, app *v1alpha2.Application) func() error {
 						return func() error {
 							if err := k8sClient.Get(ctx, client.ObjectKey{Name: a.Name, Namespace: a.Namespace}, app); err != nil {
 								return err
@@ -395,7 +395,7 @@ var _ = Describe("Application controller", func() {
 			By("Creating a new ConfigMap and rendering it with custom delimiter", func() {
 				b := application.DeepCopy()
 				b.Name = "b-app"
-				b.Spec.PreRenderer = v1alpha1.PreRenderer{
+				b.Spec.PreRenderer = v1alpha2.PreRenderer{
 					LeftDelimiter:        "<%",
 					RightDelimiter:       "%>",
 					EnableHelmTemplating: true,
@@ -422,7 +422,7 @@ var _ = Describe("Application controller", func() {
 				a := application.DeepCopy()
 				a.Name = "a-app"
 				key := client.ObjectKey{Name: a.Name, Namespace: a.Namespace}
-				currentApp := &v1alpha1.Application{}
+				currentApp := &v1alpha2.Application{}
 				Expect(k8sClient.Get(ctx, key, currentApp)).Should(BeNil())
 				a.ResourceVersion = currentApp.ResourceVersion
 				a.Spec.Template.Spec.Interval = metav1.Duration{Duration: time.Millisecond * 500}
@@ -478,7 +478,7 @@ var _ = Describe("Application controller", func() {
 		By("having missing custom rendering keys in values", func() {
 			d := application.DeepCopy()
 			d.Name = "d-app"
-			d.Spec.PreRenderer = v1alpha1.PreRenderer{
+			d.Spec.PreRenderer = v1alpha2.PreRenderer{
 				LeftDelimiter:        "<%",
 				RightDelimiter:       "%>",
 				EnableHelmTemplating: true,

controllers/suite_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	corev1alpha1 "github.com/ExpediaGroup/overwhelm/api/v1alpha1"
+	"github.com/ExpediaGroup/overwhelm/api/v1alpha2"
 	"github.com/fluxcd/helm-controller/api/v2beta1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -71,7 +71,7 @@ var _ = BeforeSuite(func() {
 
 	err = v2beta1.AddToScheme(k8sManager.GetScheme())
 	Expect(err).NotTo(HaveOccurred())
-	err = corev1alpha1.AddToScheme(k8sManager.GetScheme())
+	err = v1alpha2.AddToScheme(k8sManager.GetScheme())
 	Expect(err).NotTo(HaveOccurred())
 
 	//+kubebuilder:scaffold:scheme

main.go

@@ -18,7 +18,7 @@ import (
 	"os"
 	"time"
 
-	corev1alpha1 "github.com/ExpediaGroup/overwhelm/api/v1alpha1"
+	"github.com/ExpediaGroup/overwhelm/api/v1alpha2"
 	"github.com/ExpediaGroup/overwhelm/controllers"
 	"github.com/fluxcd/helm-controller/api/v2beta1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -42,7 +42,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(v2beta1.AddToScheme(scheme))
-	utilruntime.Must(corev1alpha1.AddToScheme(scheme))
+	utilruntime.Must(v1alpha2.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }