From 8ebd028cf3246589949228c0f1ea76ab5fc2f2d7 Mon Sep 17 00:00:00 2001 From: Yeray Borges Date: Wed, 22 Nov 2023 12:26:33 +0000 Subject: [PATCH] [285] Fix image strem processing Fixes #285 --- controllers/wildflyserver_controller.go | 9 +++++---- pkg/resources/actions.go | 2 +- pkg/resources/constants.go | 4 ++-- pkg/resources/statefulsets/statefulset.go | 3 ++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/controllers/wildflyserver_controller.go b/controllers/wildflyserver_controller.go index fd1db0859..e4f47e0d2 100644 --- a/controllers/wildflyserver_controller.go +++ b/controllers/wildflyserver_controller.go @@ -33,11 +33,12 @@ import ( corev1 "k8s.io/api/core/v1" apiErrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" - "reflect" - "k8s.io/client-go/tools/record" "os" + "reflect" + "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" "strconv" "strings" @@ -284,8 +285,7 @@ func (r *WildFlyServerReconciler) SetupWithManager(mgr ctrl.Manager) error { builder := ctrl.NewControllerManagedBy(mgr). For(&wildflyv1alpha1.WildFlyServer{}) - builder.Owns(&appsv1.StatefulSet{}). - Owns(&corev1.Service{}) + builder.Owns(&corev1.Service{}) if hasServiceMonitor() { builder.Owns(&monitoringv1.ServiceMonitor{}) @@ -296,6 +296,7 @@ func (r *WildFlyServerReconciler) SetupWithManager(mgr ctrl.Manager) error { builder.Owns(&routev1.Route{}) } + builder.Watches(&source.Kind{Type: &appsv1.StatefulSet{}}, &handler.EnqueueRequestForOwner{OwnerType: &wildflyv1alpha1.WildFlyServer{}, IsController: false}) return builder.Complete(r) } diff --git a/pkg/resources/actions.go b/pkg/resources/actions.go index 8727500f6..a363f13ec 100644 --- a/pkg/resources/actions.go +++ b/pkg/resources/actions.go @@ -30,7 +30,7 @@ func Create(w *wildflyv1alpha1.WildFlyServer, client client.Client, scheme *runt // mark the object with the current server generation MarkServerGeneration(w, meta) - if err := controllerutil.SetControllerReference(w, meta, scheme); err != nil { + if err := controllerutil.SetOwnerReference(w, meta, scheme); err != nil { logger.Error(err, "Failed to set controller reference for new resource") return err } diff --git a/pkg/resources/constants.go b/pkg/resources/constants.go index 4a79991ac..53162253d 100644 --- a/pkg/resources/constants.go +++ b/pkg/resources/constants.go @@ -21,9 +21,9 @@ const ( ImageTypeGeneric = "generic" // ImageTypeGeneric is one of the possible values for MarkerImageType annotation denoting a bootable JAR type image ImageTypeBootable = "bootable-jar" - // SecretsDir is the the directory to mount volumes from Secrets + // SecretsDir is the directory to mount volumes from Secrets SecretsDir = "/etc/secrets/" - // ConfigMapsDir is the the directory to mount volumes from ConfigMaps + // ConfigMapsDir is the directory to mount volumes from ConfigMaps ConfigMapsDir = "/etc/configmaps/" // StatefuleSetTemplateLabelsEnvVarName is the name of the envvar containg label/value map for pods created from the statefulset's template StatefuleSetTemplateLabelsEnvVarName string = "STATEFULSET_TEMPLATE_LABELS" diff --git a/pkg/resources/statefulsets/statefulset.go b/pkg/resources/statefulsets/statefulset.go index 3c49b13ce..14d2ee39e 100644 --- a/pkg/resources/statefulsets/statefulset.go +++ b/pkg/resources/statefulsets/statefulset.go @@ -80,7 +80,8 @@ func NewStatefulSet(w *wildflyv1alpha1.WildFlyServer, labels map[string]string, ObjectMeta: metav1.ObjectMeta{ Labels: labelsForActiveWildflyPod, Annotations: map[string]string{ - resources.MarkerImageType: wildflyImageTypeAnnotation, + "alpha.image.policy.openshift.io/resolve-names": "*", + resources.MarkerImageType: wildflyImageTypeAnnotation, }, }, Spec: corev1.PodSpec{