Merge pull request #706 from gianlucam76/release-0.38

Release 0.38
projectsveltos · Sep 25, 2024 · 3527c3c · 3527c3c
2 parents 94e720f + 660b109
commit 3527c3c
Show file tree

Hide file tree

Showing 26 changed files with 290 additions and 113 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ ARCH ?= $(shell go env GOARCH)
 OS ?= $(shell uname -s | tr A-Z a-z)
 K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= v0.38.2
+TAG ?= v0.38.3
 
 .PHONY: all
 all: build

diff --git a/api/v1alpha1/spec.go b/api/v1alpha1/spec.go
@@ -282,6 +282,13 @@ type HelmUpgradeOptions struct {
  // +kubebuilder:default:=false
  // +optional
  SubNotes bool `json:"subNotes,omitempty"`
+
+ // UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ // By default, CRDs are not applied during Helm upgrade action by Helm
+ // https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ // +kubebuilder:default:=false
+ // +optional
+ UpgradeCRDs bool `json:"upgradeCRDs,omitempty"`
 }
 
 type HelmUninstallOptions struct {

diff --git a/api/v1alpha1/zz_generated.conversion.go b/api/v1alpha1/zz_generated.conversion.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/v1beta1/spec.go b/api/v1beta1/spec.go
@@ -315,6 +315,13 @@ type HelmUpgradeOptions struct {
  // +kubebuilder:default:=false
  // +optional
  SubNotes bool `json:"subNotes,omitempty"`
+
+ // UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ // By default, CRDs are not applied during Helm upgrade action by Helm
+ // https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ // +kubebuilder:default:=false
+ // +optional
+ UpgradeCRDs bool `json:"upgradeCRDs,omitempty"`
 }
 
 type HelmUninstallOptions struct {

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml b/config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.16.2
+ controller-gen.kubebuilder.io/version: v0.16.3
  name: clusterconfigurations.config.projectsveltos.io
 spec:
  group: config.projectsveltos.io

diff --git a/config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml b/config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.16.2
+ controller-gen.kubebuilder.io/version: v0.16.3
  name: clusterprofiles.config.projectsveltos.io
 spec:
  group: config.projectsveltos.io
@@ -282,6 +282,13 @@ spec:
  description: SubNotes determines whether sub-notes are
  rendered in the chart.
  type: boolean
+ upgradeCRDs:
+ default: false
+ description: |-
+ UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ By default, CRDs are not applied during Helm upgrade action by Helm
+ https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ type: boolean
  type: object
  wait:
  default: false
@@ -1305,6 +1312,13 @@ spec:
  description: SubNotes determines whether sub-notes are
  rendered in the chart.
  type: boolean
+ upgradeCRDs:
+ default: false
+ description: |-
+ UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ By default, CRDs are not applied during Helm upgrade action by Helm
+ https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ type: boolean
  type: object
  wait:
  default: false

diff --git a/config/crd/bases/config.projectsveltos.io_clusterreports.yaml b/config/crd/bases/config.projectsveltos.io_clusterreports.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.16.2
+ controller-gen.kubebuilder.io/version: v0.16.3
  name: clusterreports.config.projectsveltos.io
 spec:
  group: config.projectsveltos.io

diff --git a/config/crd/bases/config.projectsveltos.io_clustersummaries.yaml b/config/crd/bases/config.projectsveltos.io_clustersummaries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.16.2
+ controller-gen.kubebuilder.io/version: v0.16.3
  name: clustersummaries.config.projectsveltos.io
 spec:
  group: config.projectsveltos.io
@@ -300,6 +300,13 @@ spec:
  description: SubNotes determines whether sub-notes
  are rendered in the chart.
  type: boolean
+ upgradeCRDs:
+ default: false
+ description: |-
+ UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ By default, CRDs are not applied during Helm upgrade action by Helm
+ https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ type: boolean
  type: object
  wait:
  default: false
@@ -1329,6 +1336,13 @@ spec:
  description: SubNotes determines whether sub-notes
  are rendered in the chart.
  type: boolean
+ upgradeCRDs:
+ default: false
+ description: |-
+ UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ By default, CRDs are not applied during Helm upgrade action by Helm
+ https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ type: boolean
  type: object
  wait:
  default: false

diff --git a/config/crd/bases/config.projectsveltos.io_profiles.yaml b/config/crd/bases/config.projectsveltos.io_profiles.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.16.2
+ controller-gen.kubebuilder.io/version: v0.16.3
  name: profiles.config.projectsveltos.io
 spec:
  group: config.projectsveltos.io
@@ -282,6 +282,13 @@ spec:
  description: SubNotes determines whether sub-notes are
  rendered in the chart.
  type: boolean
+ upgradeCRDs:
+ default: false
+ description: |-
+ UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ By default, CRDs are not applied during Helm upgrade action by Helm
+ https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ type: boolean
  type: object
  wait:
  default: false
@@ -1305,6 +1312,13 @@ spec:
  description: SubNotes determines whether sub-notes are
  rendered in the chart.
  type: boolean
+ upgradeCRDs:
+ default: false
+ description: |-
+ UpgradeCRDs upgrade CRDs from the Helm Chart's crds directory
+ By default, CRDs are not applied during Helm upgrade action by Helm
+ https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+ type: boolean
  type: object
  wait:
  default: false

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -15,4 +15,4 @@ spec:
  - "--report-mode=0"
  - --shard-key=
  - "--v=5"
- - "--version=v0.38.2"
+ - "--version=v0.38.3"
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
  spec:
  containers:
  # Change the value of image field below to your controller image URL
- - image: docker.io/projectsveltos/addon-controller:v0.38.2
+ - image: docker.io/projectsveltos/addon-controller:v0.38.3
  name: controller
diff --git a/controllers/clustersummary_watchers.go b/controllers/clustersummary_watchers.go
@@ -35,10 +35,11 @@ import (
  "k8s.io/client-go/util/retry"
  "sigs.k8s.io/controller-runtime/pkg/client"
 
- configv1beta1 "github.com/projectsveltos/addon-controller/api/v1beta1"
  "github.com/projectsveltos/libsveltos/lib/logsettings"
  logs "github.com/projectsveltos/libsveltos/lib/logsettings"
  libsveltosset "github.com/projectsveltos/libsveltos/lib/set"
+
+ configv1beta1 "github.com/projectsveltos/addon-controller/api/v1beta1"
 )
 
 var (
@@ -507,13 +508,13 @@ func (m *manager) getGVKMapEntryForFeatureID(gvk schema.GroupVersionKind, fID co
  case configv1beta1.FeatureKustomize:
  s = m.requestorForMgmtResourcesKustomizeRef[gvk]
  if s == nil {
- s := &libsveltosset.Set{}
+ s = &libsveltosset.Set{}
  m.requestorForMgmtResourcesKustomizeRef[gvk] = s
  }
  case configv1beta1.FeatureResources:
- s := m.requestorForMgmtResourcesPolicyRef[gvk]
+ s = m.requestorForMgmtResourcesPolicyRef[gvk]
  if s == nil {
- s := &libsveltosset.Set{}
+ s = &libsveltosset.Set{}
  m.requestorForMgmtResourcesPolicyRef[gvk] = s
  }
  case configv1beta1.FeatureHelm:
@@ -566,13 +567,13 @@ func (m *manager) getResourceMapEntryForFeatureID(resource *corev1.ObjectReferen
  case configv1beta1.FeatureKustomize:
  s = m.mgmtResourcesWatchedKustomizeRef[*resource]
  if s == nil {
- s := &libsveltosset.Set{}
+ s = &libsveltosset.Set{}
  m.mgmtResourcesWatchedKustomizeRef[*resource] = s
  }
  case configv1beta1.FeatureResources:
- s := m.mgmtResourcesWatchedPolicyRef[*resource]
+ s = m.mgmtResourcesWatchedPolicyRef[*resource]
  if s == nil {
- s := &libsveltosset.Set{}
+ s = &libsveltosset.Set{}
  m.mgmtResourcesWatchedPolicyRef[*resource] = s
  }
  case configv1beta1.FeatureHelm: