Skip to content

Commit

Permalink
Merge pull request #165 from fluxcd/delete-suspended-column
Browse files Browse the repository at this point in the history
Remove default value from suspend field
  • Loading branch information
hiddeco authored Nov 26, 2020
2 parents 6593970 + d97bcd5 commit 98cae50
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
5 changes: 1 addition & 4 deletions api/v2beta1/helmrelease_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ type HelmReleaseSpec struct {

// Suspend tells the controller to suspend reconciliation for this HelmRelease,
// it does not apply to already started reconciliations. Defaults to false.
// +kubebuilder:default:=false
// +kubebuilder:validation:Optional
// +optional
Suspend bool `json:"suspend"`
Suspend bool `json:"suspend,omitempty"`

// ReleaseName used for the Helm release. Defaults to a composition of
// '[TargetNamespace-]Name'.
Expand Down Expand Up @@ -748,7 +746,6 @@ const (
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
// +kubebuilder:printcolumn:name="Suspended",type="boolean",JSONPath=".spec.suspend",description=""
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""

// HelmRelease is the Schema for the helmreleases API
Expand Down
4 changes: 0 additions & 4 deletions config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ spec:
- jsonPath: .status.conditions[?(@.type=="Ready")].message
name: Status
type: string
- jsonPath: .spec.suspend
name: Suspended
type: boolean
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
Expand Down Expand Up @@ -253,7 +250,6 @@ spec:
when reconciling this HelmRelease.
type: string
suspend:
default: false
description: Suspend tells the controller to suspend reconciliation
for this HelmRelease, it does not apply to already started reconciliations.
Defaults to false.
Expand Down

0 comments on commit 98cae50

Please sign in to comment.