Skip to content

Commit e7bd397

Browse files
kabicinkabicin
kabicin
authored and
kabicin
committed
Update naming from override to patch
1 parent 63d5047 commit e7bd397

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎api/v1/runtimecomponent_types.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,21 @@ func (p *RuntimeComponentProbes) GetStartupProbe() *common.BaseComponentProbe {
551551
return p.Startup
552552
}
553553

554+
// PatchLivenessProbe updates values for and returns the liveness probe
555+
func (p *RuntimeComponentProbes) PatchLivenessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
556+
return probe
557+
}
558+
559+
// PatchReadinessProbe updates values for and returns the readiness probe
560+
func (p *RuntimeComponentProbes) PatchReadinessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
561+
return probe
562+
}
563+
564+
// PatchStartupProbe updates values for and returns the startup probe
565+
func (p *RuntimeComponentProbes) PatchStartupProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
566+
return probe
567+
}
568+
554569
// GetDefaultLivenessProbe returns default values for liveness probe
555570
func (p *RuntimeComponentProbes) GetDefaultLivenessProbe(ba common.BaseComponent) *common.BaseComponentProbe {
556571
return common.GetDefaultMicroProfileLivenessProbe(ba)
@@ -566,21 +581,6 @@ func (p *RuntimeComponentProbes) GetDefaultStartupProbe(ba common.BaseComponent)
566581
return common.GetDefaultMicroProfileStartupProbe(ba)
567582
}
568583

569-
// OverrideDefaultLivenessProbe overrides default values for and returns the liveness probe
570-
func (p *RuntimeComponentProbes) OverrideDefaultLivenessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
571-
return probe
572-
}
573-
574-
// OverrideDefaultReadinessProbe overrides default values for and returns the readiness probe
575-
func (p *RuntimeComponentProbes) OverrideDefaultReadinessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
576-
return probe
577-
}
578-
579-
// OverrideDefaultStartupProbe overrides default values for and returns the startup probe
580-
func (p *RuntimeComponentProbes) OverrideDefaultStartupProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
581-
return probe
582-
}
583-
584584
// GetVolumes returns volumes slice
585585
func (cr *RuntimeComponent) GetVolumes() []corev1.Volume {
586586
return cr.Spec.Volumes

‎api/v1beta2/runtimecomponent_types.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,18 @@ type RuntimeComponentProbes struct {
147147
Startup *common.BaseComponentProbe `json:"startup,omitempty"`
148148
}
149149

150-
// OverrideDefaultLivenessProbe overrides default values for and returns the liveness probe
151-
func (p *RuntimeComponentProbes) OverrideDefaultLivenessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
150+
// PatchLivenessProbe updates values for and returns the liveness probe
151+
func (p *RuntimeComponentProbes) PatchLivenessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
152152
return probe
153153
}
154154

155-
// OverrideDefaultReadinessProbe overrides default values for and returns the readiness probe
156-
func (p *RuntimeComponentProbes) OverrideDefaultReadinessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
155+
// PatchReadinessProbe updates values for and returns the readiness probe
156+
func (p *RuntimeComponentProbes) PatchReadinessProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
157157
return probe
158158
}
159159

160-
// OverrideDefaultStartupProbe overrides default values for and returns the startup probe
161-
func (p *RuntimeComponentProbes) OverrideDefaultStartupProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
160+
// PatchStartupProbe updates values for and returns the startup probe
161+
func (p *RuntimeComponentProbes) PatchStartupProbe(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe {
162162
return probe
163163
}
164164

‎common/types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ type BaseComponentProbes interface {
266266
GetDefaultReadinessProbe(ba BaseComponent) *BaseComponentProbe
267267
GetDefaultStartupProbe(ba BaseComponent) *BaseComponentProbe
268268

269-
OverrideDefaultLivenessProbe(ba BaseComponent, probe *BaseComponentProbe) *BaseComponentProbe
270-
OverrideDefaultReadinessProbe(ba BaseComponent, probe *BaseComponentProbe) *BaseComponentProbe
271-
OverrideDefaultStartupProbe(ba BaseComponent, probe *BaseComponentProbe) *BaseComponentProbe
269+
PatchLivenessProbe(ba BaseComponent, probe *BaseComponentProbe) *BaseComponentProbe
270+
PatchReadinessProbe(ba BaseComponent, probe *BaseComponentProbe) *BaseComponentProbe
271+
PatchStartupProbe(ba BaseComponent, probe *BaseComponentProbe) *BaseComponentProbe
272272
}
273273

274274
type BaseComponentServiceAccount interface {

‎utils/utils.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,24 +288,24 @@ func CustomizeProbes(container *corev1.Container, ba common.BaseComponent) {
288288
return
289289
}
290290

291-
container.ReadinessProbe = customizeProbe(probesConfig.GetReadinessProbe(), probesConfig.GetDefaultReadinessProbe, probesConfig.OverrideDefaultReadinessProbe, ba)
292-
container.LivenessProbe = customizeProbe(probesConfig.GetLivenessProbe(), probesConfig.GetDefaultLivenessProbe, probesConfig.OverrideDefaultLivenessProbe, ba)
293-
container.StartupProbe = customizeProbe(probesConfig.GetStartupProbe(), probesConfig.GetDefaultStartupProbe, probesConfig.OverrideDefaultStartupProbe, ba)
291+
container.ReadinessProbe = customizeProbe(probesConfig.GetReadinessProbe(), probesConfig.GetDefaultReadinessProbe, probesConfig.PatchReadinessProbe, ba)
292+
container.LivenessProbe = customizeProbe(probesConfig.GetLivenessProbe(), probesConfig.GetDefaultLivenessProbe, probesConfig.PatchLivenessProbe, ba)
293+
container.StartupProbe = customizeProbe(probesConfig.GetStartupProbe(), probesConfig.GetDefaultStartupProbe, probesConfig.PatchStartupProbe, ba)
294294
}
295295

296-
func customizeProbe(config *common.BaseComponentProbe, getDefaultProbeCallback func(ba common.BaseComponent) *common.BaseComponentProbe, overrideProbeDefaultsCallback func(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe, ba common.BaseComponent) *corev1.Probe {
296+
func customizeProbe(config *common.BaseComponentProbe, getDefaultProbeCallback func(ba common.BaseComponent) *common.BaseComponentProbe, patchProbeCallback func(ba common.BaseComponent, probe *common.BaseComponentProbe) *common.BaseComponentProbe, ba common.BaseComponent) *corev1.Probe {
297297
// Probe not defined -- set probe to nil
298298
if config == nil {
299299
return nil
300300
}
301301

302302
// Probe handler is defined in config so use probe as is
303303
if config.BaseComponentProbeHandler != (common.BaseComponentProbeHandler{}) {
304-
return ConvertToCoreProbe(ba, overrideProbeDefaultsCallback(ba, config))
304+
return ConvertToCoreProbe(ba, patchProbeCallback(ba, config))
305305
}
306306

307307
// Probe handler is not defined so use default values for the probe if values not set in probe config
308-
return ConvertToCoreProbe(ba, overrideProbeDefaultsCallback(ba, customizeProbeDefaults(config, getDefaultProbeCallback(ba))))
308+
return ConvertToCoreProbe(ba, patchProbeCallback(ba, customizeProbeDefaults(config, getDefaultProbeCallback(ba))))
309309
}
310310

311311
func createHTTPGetActionFromOptionalHTTPGetAction(ba common.BaseComponent, optionalHTTPGetAction *common.OptionalHTTPGetAction) *corev1.HTTPGetAction {

0 commit comments

Comments
 (0)