diff --git a/README.md b/README.md index 51a5782..8d4b51d 100644 --- a/README.md +++ b/README.md @@ -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: "" @@ -45,7 +45,7 @@ Services must be annotated to opt-in to being observed by the keepalived operato `keepalived-operator.redhat-cop.io/keepalivedgroup: /` -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 diff --git a/api/v1alpha1/keepalivedgroup_types.go b/api/v1alpha1/keepalivedgroup_types.go index 96f5b5b..7fe6efc 100644 --- a/api/v1alpha1/keepalivedgroup_types.go +++ b/api/v1alpha1/keepalivedgroup_types.go @@ -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 diff --git a/config/crd/bases/redhatcop.redhat.io_keepalivedgroups.yaml b/config/crd/bases/redhatcop.redhat.io_keepalivedgroups.yaml index ede7c61..b12d9f0 100644 --- a/config/crd/bases/redhatcop.redhat.io_keepalivedgroups.yaml +++ b/config/crd/bases/redhatcop.redhat.io_keepalivedgroups.yaml @@ -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: diff --git a/config/manifests/bases/keepalived-operator.clusterserviceversion.yaml b/config/manifests/bases/keepalived-operator.clusterserviceversion.yaml index 8f11828..b7fedd0 100644 --- a/config/manifests/bases/keepalived-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/keepalived-operator.clusterserviceversion.yaml @@ -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 @@ -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: /`\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), diff --git a/config/samples/redhatcop_v1alpha1_keepalivedgroup.yaml b/config/samples/redhatcop_v1alpha1_keepalivedgroup.yaml index 0b4746b..b555830 100644 --- a/config/samples/redhatcop_v1alpha1_keepalivedgroup.yaml +++ b/config/samples/redhatcop_v1alpha1_keepalivedgroup.yaml @@ -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: "" diff --git a/controllers/keepalivedgroup_controller.go b/controllers/keepalivedgroup_controller.go index 21f8e1c..89aa45a 100644 --- a/controllers/keepalivedgroup_controller.go +++ b/controllers/keepalivedgroup_controller.go @@ -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