-
Notifications
You must be signed in to change notification settings - Fork 33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
metallb: add metallb controller and speaker builder func #276
Open
gkopels
wants to merge
1
commit into
openshift-kni:main
Choose a base branch
from
gkopels:add-metallb-helmchart-config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -8,6 +8,7 @@ import ( | |||||
"github.com/openshift-kni/eco-goinfra/pkg/clients" | ||||||
"github.com/openshift-kni/eco-goinfra/pkg/metallb/mlbtypes" | ||||||
"github.com/openshift-kni/eco-goinfra/pkg/msg" | ||||||
corev1 "k8s.io/api/core/v1" | ||||||
k8serrors "k8s.io/apimachinery/pkg/api/errors" | ||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||||||
|
@@ -326,6 +327,195 @@ func (builder *Builder) WithSpeakerNodeSelector(label map[string]string) *Builde | |||||
return builder | ||||||
} | ||||||
|
||||||
// WithControllerPriorityClassName adds a priority class name tp the metallb controller config. | ||||||
func (builder *Builder) WithControllerPriorityClassName(priorityClassName string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
// if len(priorityClassName) == 0 { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please remove commented code |
||||||
// glog.V(100).Infof(" Controller Config parameter priorityClassName cannot be an empty field") | ||||||
// | ||||||
// return builder | ||||||
//} | ||||||
|
||||||
builder.Definition.Spec.ControllerConfig.PriorityClassName = priorityClassName | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithControllerRuntimeClassName adds a runtime class name tp the metallb controller config. | ||||||
func (builder *Builder) WithControllerRuntimeClassName(runtimeClassName string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
if len(runtimeClassName) == 0 { | ||||||
glog.V(100).Infof("Controller Config parameter runtimeClassName cannot be an empty field") | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec.ControllerConfig.RuntimeClassName = runtimeClassName | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithControllerAnnotationMapString adds a runtime class name tp the metallb controller config. | ||||||
func (builder *Builder) WithControllerAnnotationMapString(annotationMapString map[string]string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
if len(annotationMapString) == 0 { | ||||||
glog.V(100).Infof(" Controller Config parameter annotationMapString cannot be an empty field") | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec.ControllerConfig.Annotations = annotationMapString | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithControllerPodAffinityLabel adds a runtime class name tp the metallb controller config. | ||||||
func (builder *Builder) WithControllerPodAffinityLabel(controllerPodAffinityLabel string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
if len(controllerPodAffinityLabel) == 0 { | ||||||
glog.V(100).Infof("Controller Config parameter runtimeClassName cannot be an empty field") | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec = mlbtypes.MetalLBSpec{ | ||||||
ControllerConfig: &mlbtypes.Config{ | ||||||
Affinity: &corev1.Affinity{ | ||||||
PodAffinity: &corev1.PodAffinity{ | ||||||
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{ | ||||||
{LabelSelector: &metav1.LabelSelector{ | ||||||
MatchLabels: map[string]string{"component": controllerPodAffinityLabel}, | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. could this be more flexible by passing in the map for the MatchLabels and a string parameter for the TopologyKey:
Suggested change
|
||||||
}, | ||||||
TopologyKey: "kubernetes.io/hostname", | ||||||
}, | ||||||
}, | ||||||
}, | ||||||
}, | ||||||
}, | ||||||
} | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithControllerTolerations adds a toleration configuration inside the speaker on . | ||||||
func (builder *Builder) WithControllerTolerations(tolerationKey, tolerationOperator, tolerationEffect string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
operator := corev1.TolerationOperator(tolerationOperator) | ||||||
effect := corev1.TaintEffect(tolerationEffect) | ||||||
toleration := corev1.Toleration{Key: tolerationKey, Operator: operator, Effect: effect} | ||||||
|
||||||
glog.V(100).Infof("Updating pod %s with toleration %v", builder.Definition.Name, toleration) | ||||||
|
||||||
if builder.errorMsg != "" { | ||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec.ControllerTolerations = append(builder.Definition.Spec.ControllerTolerations, toleration) | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithSpeakerPriorityClassName adds a priority class name tp the metallb controller config. | ||||||
func (builder *Builder) WithSpeakerPriorityClassName(priorityClassName string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
if len(priorityClassName) == 0 { | ||||||
glog.V(100).Infof(" Controller Config parameter priorityClassName cannot be an empty field") | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec.SpeakerConfig.PriorityClassName = priorityClassName | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithSpeakerRuntimeClassName adds a runtime class name tp the metallb controller config. | ||||||
func (builder *Builder) WithSpeakerRuntimeClassName(runtimeClassName string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
if len(runtimeClassName) == 0 { | ||||||
glog.V(100).Infof("Controller Config parameter runtimeClassName cannot be an empty field") | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec.SpeakerConfig.RuntimeClassName = runtimeClassName | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithSpeakerPodAffinityLabel adds a runtime class name tp the metallb controller config. | ||||||
func (builder *Builder) WithSpeakerPodAffinityLabel(controllerPodAffinityLabel string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
if len(controllerPodAffinityLabel) == 0 { | ||||||
glog.V(100).Infof("Speaker Config parameter runtimeClassName cannot be an empty field") | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec = mlbtypes.MetalLBSpec{ | ||||||
SpeakerConfig: &mlbtypes.Config{ | ||||||
Affinity: &corev1.Affinity{ | ||||||
PodAffinity: &corev1.PodAffinity{ | ||||||
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{ | ||||||
{LabelSelector: &metav1.LabelSelector{ | ||||||
MatchLabels: map[string]string{"component": controllerPodAffinityLabel}, | ||||||
}, | ||||||
TopologyKey: "kubernetes.io/hostname", | ||||||
}, | ||||||
}, | ||||||
}, | ||||||
}, | ||||||
}, | ||||||
} | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithSpeakerTolerations adds a toleration configuration inside the speaker configuration . | ||||||
func (builder *Builder) WithSpeakerTolerations(tolerationKey, tolerationOperator, tolerationEffect string) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
return builder | ||||||
} | ||||||
|
||||||
operator := corev1.TolerationOperator(tolerationOperator) | ||||||
effect := corev1.TaintEffect(tolerationEffect) | ||||||
toleration := corev1.Toleration{Key: tolerationKey, Operator: operator, Effect: effect} | ||||||
|
||||||
glog.V(100).Infof("Updating pod %s with toleration %v", builder.Definition.Name, toleration) | ||||||
|
||||||
if builder.errorMsg != "" { | ||||||
return builder | ||||||
} | ||||||
|
||||||
builder.Definition.Spec.SpeakerTolerations = append(builder.Definition.Spec.SpeakerTolerations, toleration) | ||||||
|
||||||
return builder | ||||||
} | ||||||
|
||||||
// WithOptions creates metallb with generic mutation options. | ||||||
func (builder *Builder) WithOptions(options ...AdditionalOptions) *Builder { | ||||||
if valid, _ := builder.validate(); !valid { | ||||||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be
to
?