From 022ae46319bf32452591a100b4cdb5101a3c2c82 Mon Sep 17 00:00:00 2001 From: Zuhair AlSader Date: Tue, 29 Aug 2023 01:00:33 -0400 Subject: [PATCH] helm: increase backoff limit (#116) --- VERSION | 2 +- api/v1alpha1/koorcluster_types.go | 2 +- api/v1alpha1/koorcluster_webhook.go | 6 +++--- bundle/manifests/koor-operator.clusterserviceversion.yaml | 8 ++++---- bundle/manifests/storage.koor.tech_koorclusters.yaml | 2 +- charts/koor-operator/Chart.yaml | 4 ++-- charts/koor-operator/README.md | 2 +- charts/koor-operator/templates/koorcluster-crd.yaml | 2 +- charts/koor-operator/templates/koorcluster-job.yaml | 1 + charts/koor-operator/templates/predelete-job.yaml | 1 + charts/koor-operator/values.yaml | 2 +- config/crd/bases/storage.koor.tech_koorclusters.yaml | 2 +- config/manager/kustomization.yaml | 2 +- utils/version.go | 2 +- 14 files changed, 20 insertions(+), 18 deletions(-) diff --git a/VERSION b/VERSION index 42045ac..c2c0004 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.4 +0.3.5 diff --git a/api/v1alpha1/koorcluster_types.go b/api/v1alpha1/koorcluster_types.go index f917991..06ce823 100644 --- a/api/v1alpha1/koorcluster_types.go +++ b/api/v1alpha1/koorcluster_types.go @@ -40,7 +40,7 @@ type KoorClusterSpec struct { // Installs a debugging toolbox deployment //+kubebuilder:default:=true ToolboxEnabled *bool `json:"toolboxEnabled,omitempty"` - // Specifies the notification options for new ceph versions + // Specifies the upgrade options for new ceph versions UpgradeOptions UpgradeOptions `json:"upgradeOptions,omitempty"` // The name to use for KSD helm release. //+kubebuilder:default:=ksd diff --git a/api/v1alpha1/koorcluster_webhook.go b/api/v1alpha1/koorcluster_webhook.go index a27b7ae..874ffa1 100644 --- a/api/v1alpha1/koorcluster_webhook.go +++ b/api/v1alpha1/koorcluster_webhook.go @@ -74,7 +74,7 @@ func (r *KoorCluster) ValidateDelete() error { func (r *KoorCluster) validateKoorCluster() error { var allErrs field.ErrorList - if err := r.validateNotificationSchedule(); err != nil { + if err := r.validateUpgradeSchedule(); err != nil { allErrs = append(allErrs, err) } if len(allErrs) == 0 { @@ -85,14 +85,14 @@ func (r *KoorCluster) validateKoorCluster() error { r.Name, allErrs) } -func (r *KoorCluster) validateNotificationSchedule() *field.Error { +func (r *KoorCluster) validateUpgradeSchedule() *field.Error { if !r.Spec.UpgradeOptions.IsEnabled() { return nil } schedule := r.Spec.UpgradeOptions.Schedule if _, err := cron.ParseStandard(schedule); err != nil { - return field.Invalid(field.NewPath("spec").Child("notificationOptions").Child("schedule"), schedule, err.Error()) + return field.Invalid(field.NewPath("spec").Child("upgradeOptions").Child("schedule"), schedule, err.Error()) } return nil } diff --git a/bundle/manifests/koor-operator.clusterserviceversion.yaml b/bundle/manifests/koor-operator.clusterserviceversion.yaml index 874c696..59b4931 100644 --- a/bundle/manifests/koor-operator.clusterserviceversion.yaml +++ b/bundle/manifests/koor-operator.clusterserviceversion.yaml @@ -32,10 +32,10 @@ metadata: } ] capabilities: Basic Install - createdAt: "2023-08-17T23:10:16Z" + createdAt: "2023-08-29T04:48:12Z" operators.operatorframework.io/builder: operator-sdk-v1.26.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: koor-operator.v0.3.4 + name: koor-operator.v0.3.5 namespace: placeholder spec: apiservicedefinitions: {} @@ -183,7 +183,7 @@ spec: - --leader-elect command: - /manager - image: docker.io/koorinc/koor-operator:v0.3.4 + image: docker.io/koorinc/koor-operator:v0.3.5 livenessProbe: httpGet: path: /healthz @@ -286,7 +286,7 @@ spec: provider: name: Koor Technology, Inc. url: koor.tech - version: 0.3.4 + version: 0.3.5 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/manifests/storage.koor.tech_koorclusters.yaml b/bundle/manifests/storage.koor.tech_koorclusters.yaml index eb05ee9..fda34cd 100644 --- a/bundle/manifests/storage.koor.tech_koorclusters.yaml +++ b/bundle/manifests/storage.koor.tech_koorclusters.yaml @@ -66,7 +66,7 @@ spec: description: Installs a debugging toolbox deployment type: boolean upgradeOptions: - description: Specifies the notification options for new ceph versions + description: Specifies the upgrade options for new ceph versions properties: endpoint: default: versions.koor.tech diff --git a/charts/koor-operator/Chart.yaml b/charts/koor-operator/Chart.yaml index fcc7e46..96bbdd0 100644 --- a/charts/koor-operator/Chart.yaml +++ b/charts/koor-operator/Chart.yaml @@ -16,14 +16,14 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) # To change this, change the version inside the file VERSION -version: 0.3.4 +version: 0.3.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. # To change this, change the version inside the file VERSION -appVersion: "v0.3.4" +appVersion: "v0.3.5" # The optional kubeVersion field can define semver constraints on supported Kubernetes versions. # Helm will validate the version constraints when installing the chart and fail if the cluster diff --git a/charts/koor-operator/README.md b/charts/koor-operator/README.md index cfb9319..35d79c0 100644 --- a/charts/koor-operator/README.md +++ b/charts/koor-operator/README.md @@ -52,7 +52,7 @@ The following table lists the configurable parameters of the rook-operator chart | `controllerManager.manager.args` | Operator args | `["--health-probe-bind-address=:8081","--metrics-bind-address=127.0.0.1:8080","--leader-elect"]` | | `controllerManager.manager.containerSecurityContext` | Operator container security context | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` | | `controllerManager.manager.image.repository` | Operator image repository | `"docker.io/koorinc/koor-operator"` | -| `controllerManager.manager.image.tag` | Operator image tag | `"v0.3.4"` | +| `controllerManager.manager.image.tag` | Operator image tag | `"v0.3.5"` | | `controllerManager.manager.resources` | Operator container resources | `{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"10m","memory":"128Mi"}}` | | `controllerManager.replicas` | | `1` | | `koorCluster.spec.dashboardEnabled` | Enable the Ceph MGR dashboard. | `true` | diff --git a/charts/koor-operator/templates/koorcluster-crd.yaml b/charts/koor-operator/templates/koorcluster-crd.yaml index dc9af8b..6e794ae 100644 --- a/charts/koor-operator/templates/koorcluster-crd.yaml +++ b/charts/koor-operator/templates/koorcluster-crd.yaml @@ -68,7 +68,7 @@ spec: description: Installs a debugging toolbox deployment type: boolean upgradeOptions: - description: Specifies the notification options for new ceph versions + description: Specifies the upgrade options for new ceph versions properties: endpoint: default: versions.koor.tech diff --git a/charts/koor-operator/templates/koorcluster-job.yaml b/charts/koor-operator/templates/koorcluster-job.yaml index fa250ac..3d5e12b 100644 --- a/charts/koor-operator/templates/koorcluster-job.yaml +++ b/charts/koor-operator/templates/koorcluster-job.yaml @@ -7,6 +7,7 @@ metadata: app.kubernetes.io/part-of: koor-operator {{- include "koor-operator.labels" . | nindent 4 }} spec: + backoffLimit: 20 template: metadata: name: {{ include "koor-operator.jobName" . }} diff --git a/charts/koor-operator/templates/predelete-job.yaml b/charts/koor-operator/templates/predelete-job.yaml index 74fbe2d..82f777e 100644 --- a/charts/koor-operator/templates/predelete-job.yaml +++ b/charts/koor-operator/templates/predelete-job.yaml @@ -10,6 +10,7 @@ metadata: helm.sh/hook: pre-delete helm.sh/hook-delete-policy: hook-succeeded spec: + backoffLimit: 20 template: metadata: name: {{ include "koor-operator.fullname" . }}-predelete-job diff --git a/charts/koor-operator/values.yaml b/charts/koor-operator/values.yaml index 2ecc801..47a0a1b 100644 --- a/charts/koor-operator/values.yaml +++ b/charts/koor-operator/values.yaml @@ -49,7 +49,7 @@ controllerManager: # -- Operator image repository repository: docker.io/koorinc/koor-operator # -- Operator image tag - tag: v0.3.4 + tag: v0.3.5 # -- Operator container resources resources: limits: diff --git a/config/crd/bases/storage.koor.tech_koorclusters.yaml b/config/crd/bases/storage.koor.tech_koorclusters.yaml index 2b7ea8e..5fd8e78 100644 --- a/config/crd/bases/storage.koor.tech_koorclusters.yaml +++ b/config/crd/bases/storage.koor.tech_koorclusters.yaml @@ -56,7 +56,7 @@ spec: description: Installs a debugging toolbox deployment type: boolean upgradeOptions: - description: Specifies the notification options for new ceph versions + description: Specifies the upgrade options for new ceph versions properties: endpoint: default: versions.koor.tech diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index cad154b..038319c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: docker.io/koorinc/koor-operator - newTag: v0.3.4 + newTag: v0.3.5 diff --git a/utils/version.go b/utils/version.go index fc7fb59..f48a4ab 100644 --- a/utils/version.go +++ b/utils/version.go @@ -17,5 +17,5 @@ limitations under the License. package utils const ( - OperatorVersion = "0.3.4" + OperatorVersion = "0.3.5" )