Skip to content

Use the new RHEL9 keepalived image #133

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.

Sign up for GitHub

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

Open
vinzent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use the new RHEL9 keepalived image #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kind: KeepalivedGroup
metadata:
name: keepalivedgroup-router
spec:
image: registry.redhat.io/openshift4/ose-keepalived-ipfailover
image: registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9
interface: ens3
nodeSelector:
node-role.kubernetes.io/loadbalancer: ""
Expand All @@ -45,7 +45,7 @@ Services must be annotated to opt-in to being observed by the keepalived operato

`keepalived-operator.redhat-cop.io/keepalivedgroup: <keepalivedgroup namespace>/<keepalivedgroup-name>`

The image used for the keepalived containers can be specified with `.Spec.Image` it will default to `registry.redhat.io/openshift4/ose-keepalived-ipfailover` if undefined.
The image used for the keepalived containers can be specified with `.Spec.Image` it will default to `registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9` if undefined.

## Requirements

Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/keepalivedgroup_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type KeepalivedGroupSpec struct {

// //+kubebuilder:validation:Optional
// +kubebuilder:validation:Required
// +kubebuilder:default:=registry.redhat.io/openshift4/ose-keepalived-ipfailover
// +kubebuilder:default:=registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9
Image string `json:"image"`

// +kubebuilder:validation:Required
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/redhatcop.redhat.io_keepalivedgroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
daemonsetPodPriorityClassName:
type: string
image:
default: registry.redhat.io/openshift4/ose-keepalived-ipfailover
default: registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9
description: //+kubebuilder:validation:Optional
type: string
interface:
Expand Down
4 changes: 2 additions & 2 deletions config/manifests/bases/keepalived-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
has been introduced. This CRD is supposed to be configured by an administrator
and allows you to specify a node selector to pick on which nodes the keepalived
pods should be deployed. Here is an example:\n\n```yaml\napiVersion: redhatcop.redhat.io/v1alpha1\nkind:
KeepalivedGroup\nmetadata:\n name: keepalivedgroup-router\nspec:\n image: registry.redhat.io/openshift4/ose-keepalived-ipfailover\n
KeepalivedGroup\nmetadata:\n name: keepalivedgroup-router\nspec:\n image: registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9\n
\ interface: ens3\n nodeSelector:\n node-role.kubernetes.io/loadbalancer:
\"\"\n blacklistRouterIDs:\n - 1\n - 2 \n```\n\nThis KeepalivedGroup will
be deployed on all the nodes with role `loadbalancer`. One must also specify the
Expand All @@ -59,7 +59,7 @@ spec:
to being observed by the keepalived operator and to specify which KeepalivedGroup
they refer to. The annotation looks like this:\n\n`keepalived-operator.redhat-cop.io/keepalivedgroup:
<keepalivedgroup namespace>/<keepalivedgroup-name>`\n\nThe image used for the
keepalived containers can be specified with `.Spec.Image` it will default to `registry.redhat.io/openshift4/ose-keepalived-ipfailover`
keepalived containers can be specified with `.Spec.Image` it will default to `registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9`
if undefined. \n\n## Requirements\n\n### Security Context Constraints\n\nEach
KeepalivedGroup deploys a [daemonset](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/)
that requires the [privileged scc](https://docs.openshift.com/container-platform/4.5/authentication/managing-security-context-constraints.html),
Expand Down
2 changes: 1 addition & 1 deletion config/samples/redhatcop_v1alpha1_keepalivedgroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: KeepalivedGroup
metadata:
name: keepalivedgroup-workers
spec:
image: registry.redhat.io/openshift4/ose-keepalived-ipfailover
image: registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9
interface: ens3
nodeSelector:
node-role.kubernetes.io/loadbalancer: ""
Expand Down
2 changes: 1 addition & 1 deletion controllers/keepalivedgroup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ func (r *KeepalivedGroupReconciler) getReferencingServices(instance *redhatcopv1
// func (r *KeepalivedGroupReconciler) IsInitialized(instance *redhatcopv1alpha1.KeepalivedGroup) bool {
// initialized := true
// if instance.Spec.Image == "" {
// instance.Spec.Image = "registry.redhat.io/openshift4/ose-keepalived-ipfailover"
// instance.Spec.Image = "registry.redhat.io/openshift4/ose-keepalived-ipfailover-rhel9"
// initialized = false
// }
// return initialized
Expand Down