[285] Fix image strem processing

Fixes #285
wildfly · Nov 22, 2023 · 8ebd028 · 8ebd028
1 parent fab0001
commit 8ebd028
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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{