Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
helm: increase backoff limit (#116)
Browse files Browse the repository at this point in the history
  • Loading branch information
zalsader authored Aug 29, 2023
1 parent ae4dfe8 commit 022ae46
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.4
0.3.5
2 changes: 1 addition & 1 deletion api/v1alpha1/koorcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions api/v1alpha1/koorcluster_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
8 changes: 4 additions & 4 deletions bundle/manifests/koor-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -286,7 +286,7 @@ spec:
provider:
name: Koor Technology, Inc.
url: koor.tech
version: 0.3.4
version: 0.3.5
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/storage.koor.tech_koorclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/koor-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/koor-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 1 addition & 1 deletion charts/koor-operator/templates/koorcluster-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions charts/koor-operator/templates/koorcluster-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
Expand Down
1 change: 1 addition & 0 deletions charts/koor-operator/templates/predelete-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/koor-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/storage.koor.tech_koorclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: docker.io/koorinc/koor-operator
newTag: v0.3.4
newTag: v0.3.5
2 changes: 1 addition & 1 deletion utils/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ limitations under the License.
package utils

const (
OperatorVersion = "0.3.4"
OperatorVersion = "0.3.5"
)

0 comments on commit 022ae46

Please sign in to comment.