Skip to content

Commit

Permalink
k8s: update api with latest changes in helm chart
Browse files Browse the repository at this point in the history 
(cherry picked from commit 77a955a)
  • Loading branch information
@alejandroEsc @vbotbuildovich
alejandroEsc authored and vbotbuildovich committed Aug 30, 2023
1 parent 21e6b92 commit abc02f5
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 14 deletions.
36 changes: 22 additions & 14 deletions src/go/k8s/apis/redpanda/v1alpha1/redpanda_clusterspec_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ type RedpandaClusterSpec struct {
}

type ConfigWatcher struct {
Enabled *bool `json:"enabled,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
SecurityContext *corev1.SecurityContext `json:"SecurityContext,omitempty"`
Enabled *bool `json:"enabled,omitempty"`
ExtraVolumeMounts string `json:"extraVolumeMounts,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
SecurityContext *corev1.SecurityContext `json:"SecurityContext,omitempty"`
}

// RedpandaImage is a top level field of the values file
Expand Down Expand Up @@ -271,6 +272,8 @@ type Statefulset struct {
AdditionalRedpandaCmdFlags []string `json:"additionalRedpandaCmdFlags,omitempty"`
Annotations map[string]string `json:"annotations,omitempty"`
Budget *Budget `json:"budget,omitempty"`
ExtraVolumeMounts string `json:"extraVolumeMounts,omitempty"`
ExtraVolumes string `json:"extraVolumes,omitempty"`
InitContainerImage *InitContainerImage `json:"initContainerImage,omitempty"`
InitContainers *InitContainers `json:"initContainers,omitempty"`
LivenessProbe *LivenessProbe `json:"livenessProbe,omitempty"`
Expand Down Expand Up @@ -339,13 +342,14 @@ type UpdateStrategy struct {

// Tuning is a top level field of the values file
type Tuning struct {
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
BallastFilePath *string `json:"ballast_file_path,omitempty"`
BallastFileSize *string `json:"ballast_file_size,omitempty"`
TuneAioEvents *bool `json:"tune_aio_events,omitempty"`
TuneBallastFile *bool `json:"tune_ballast_file,omitempty"`
TuneClockSource *bool `json:"tune_clocksource,omitempty"`
WellKnownIo *string `json:"well_known_io,omitempty"`
ExtraVolumeMounts string `json:"extraVolumeMounts,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
BallastFilePath *string `json:"ballast_file_path,omitempty"`
BallastFileSize *string `json:"ballast_file_size,omitempty"`
TuneAioEvents *bool `json:"tune_aio_events,omitempty"`
TuneBallastFile *bool `json:"tune_ballast_file,omitempty"`
TuneClockSource *bool `json:"tune_clocksource,omitempty"`
WellKnownIo *string `json:"well_known_io,omitempty"`
}

// Listeners is a top level field of the values file
Expand Down Expand Up @@ -459,8 +463,9 @@ type ServiceAccount struct {
}

type SetDataDirOwnership struct {
Enabled *bool `json:"enabled,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
Enabled *bool `json:"enabled,omitempty"`
ExtraVolumeMounts string `json:"extraVolumeMounts,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
}

type InitContainerImage struct {
Expand All @@ -470,17 +475,20 @@ type InitContainerImage struct {

type InitContainers struct {
Configurator *Configurator `json:"configurator,omitempty"`
ExtraInitContainers string `json:"extraInitContainers,omitempty"`
SetDataDirOwnership *SetDataDirOwnership `json:"setDataDirOwnership,omitempty"`
SetTieredStorageCacheDirOwnership *SetTieredStorageCacheDirOwnership `json:"setTieredStorageCacheDirOwnership,omitempty"`
Tuning *Tuning `json:"tuning,omitempty"`
}

type Configurator struct {
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
ExtraVolumeMounts string `json:"extraVolumeMounts,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
}

type SetTieredStorageCacheDirOwnership struct {
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
ExtraVolumeMounts string `json:"extraVolumeMounts,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
}

type Monitoring struct {
Expand Down
18 changes: 18 additions & 0 deletions src/go/k8s/config/crd/bases/cluster.redpanda.com_redpandas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,10 @@ spec:
required:
- maxUnavailable
type: object
extraVolumeMounts:
type: string
extraVolumes:
type: string
initContainerImage:
properties:
repository:
Expand All @@ -891,6 +895,8 @@ spec:
properties:
configurator:
properties:
extraVolumeMounts:
type: string
resources:
description: ResourceRequirements describes the compute
resource requirements.
Expand Down Expand Up @@ -944,10 +950,14 @@ spec:
type: object
type: object
type: object
extraInitContainers:
type: string
setDataDirOwnership:
properties:
enabled:
type: boolean
extraVolumeMounts:
type: string
resources:
description: ResourceRequirements describes the compute
resource requirements.
Expand Down Expand Up @@ -1003,6 +1013,8 @@ spec:
type: object
setTieredStorageCacheDirOwnership:
properties:
extraVolumeMounts:
type: string
resources:
description: ResourceRequirements describes the compute
resource requirements.
Expand Down Expand Up @@ -1064,6 +1076,8 @@ spec:
type: string
ballast_file_size:
type: string
extraVolumeMounts:
type: string
resources:
description: ResourceRequirements describes the compute
resource requirements.
Expand Down Expand Up @@ -2184,6 +2198,8 @@ spec:
type: object
enabled:
type: boolean
extraVolumeMounts:
type: string
resources:
description: ResourceRequirements describes the compute
resource requirements.
Expand Down Expand Up @@ -2775,6 +2791,8 @@ spec:
type: string
ballast_file_size:
type: string
extraVolumeMounts:
type: string
resources:
description: ResourceRequirements describes the compute resource
requirements.
Expand Down

0 comments on commit abc02f5

Please sign in to comment.