Updated strimzi version (#827)

Makefile

@@ -7,7 +7,7 @@ IMAGE_TAG_BASE ?= quay.io/cloudservices/clowder
 CLOWDER_BUILD_TAG ?= $(shell git rev-parse --short=8 HEAD)
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.24
+ENVTEST_K8S_VERSION = 1.26
 
 # Image URL to use all building/pushing image targets
 ifeq ($(findstring -minikube,${MAKECMDGOALS}), -minikube)

build/kube_setup.sh

@@ -64,7 +64,7 @@ mkdir -p "$DOWNLOAD_DIR"
 
 
 function install_strimzi_operator {
-    STRIMZI_VERSION=0.29.0
+    STRIMZI_VERSION=0.34.0
     STRIMZI_OPERATOR_NS=strimzi
     WATCH_NS="*"
     STRIMZI_TARFILE="strimzi-${STRIMZI_VERSION}.tar.gz"
@@ -115,8 +115,8 @@ function install_strimzi_operator {
         --clusterrole=strimzi-cluster-operator-namespaced --serviceaccount ${STRIMZI_OPERATOR_NS}:strimzi-cluster-operator || echo " ... ignoring that error"
     ${KUBECTL_CMD} create clusterrolebinding strimzi-cluster-operator-entity-operator-delegation \
         --clusterrole=strimzi-entity-operator --serviceaccount ${STRIMZI_OPERATOR_NS}:strimzi-cluster-operator || echo " ... ignoring that error"
-    ${KUBECTL_CMD} create clusterrolebinding strimzi-cluster-operator-topic-operator-delegation \
-        --clusterrole=strimzi-topic-operator --serviceaccount ${STRIMZI_OPERATOR_NS}:strimzi-cluster-operator || echo " ... ignoring that error"
+    ${KUBECTL_CMD} create clusterrolebinding strimzi-cluster-operator-watched \
+        --clusterrole=strimzi-cluster-operator-watched --serviceaccount ${STRIMZI_OPERATOR_NS}:strimzi-cluster-operator || echo " ... ignoring that error"
 
     if [ $REINSTALL -ne 1 ]; then
         echo "*** Installing Strimzi resources ..."
@@ -286,7 +286,7 @@ function install_keda_operator {
     fi
 
     echo "*** Applying keda-operator manifest ..."
-    ${KUBECTL_CMD} apply -f https://github.com/kedacore/keda/releases/download/v2.4.0/keda-2.4.0.yaml
+    ${KUBECTL_CMD} apply -f https://github.com/kedacore/keda/releases/download/v2.10.1/keda-2.10.1.yaml
 
     echo "*** Will wait for keda-operator to come up in background"
     ${KUBECTL_CMD} rollout status deployment/$DEPLOYMENT -n $OPERATOR_NS | sed "s/^/[keda-operator] /" &

build/pr_check_inner.sh

@@ -30,7 +30,7 @@ export PATH="/bins:$PATH"
 chmod 600 minikube-ssh-ident
 
 ssh -o StrictHostKeyChecking=no $MINIKUBE_USER@$MINIKUBE_HOST -i minikube-ssh-ident "minikube delete"
-ssh -o StrictHostKeyChecking=no $MINIKUBE_USER@$MINIKUBE_HOST -i minikube-ssh-ident "minikube start --cpus 6 --disk-size 10GB --memory 16000MB --kubernetes-version=1.23.5 --addons=metrics-server --disable-optimizations"
+ssh -o StrictHostKeyChecking=no $MINIKUBE_USER@$MINIKUBE_HOST -i minikube-ssh-ident "minikube start --cpus 6 --disk-size 10GB --memory 16000MB --kubernetes-version=1.26.3 --addons=metrics-server --disable-optimizations"
 
 export MINIKUBE_IP=`ssh -o StrictHostKeyChecking=no $MINIKUBE_USER@$MINIKUBE_HOST -i minikube-ssh-ident "minikube ip"`
 

config/crd/bases/cloud.redhat.com_clowdenvironments.yaml

@@ -517,6 +517,29 @@ spec:
                               default resource requirements from the ClowdEnvironment
                               will be used.
                             properties:
+                              claims:
+                                description: "Claims lists the names of resources,
+                                  defined in spec.resourceClaims, that are used by
+                                  this container. \n This is an alpha field and requires
+                                  enabling the DynamicResourceAllocation feature gate.
+                                  \n This field is immutable."
+                                items:
+                                  description: ResourceClaim references one entry
+                                    in PodSpec.ResourceClaims.
+                                  properties:
+                                    name:
+                                      description: Name must match the name of one
+                                        entry in pod.spec.resourceClaims of the Pod
+                                        where this field is used. It makes that resource
+                                        available inside a container.
+                                      type: string
+                                  required:
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
                               limits:
                                 additionalProperties:
                                   anyOf:
@@ -561,6 +584,30 @@ spec:
                                     description: Defines the resource requests/limits
                                       set on selenium containers
                                     properties:
+                                      claims:
+                                        description: "Claims lists the names of resources,
+                                          defined in spec.resourceClaims, that are
+                                          used by this container. \n This is an alpha
+                                          field and requires enabling the DynamicResourceAllocation
+                                          feature gate. \n This field is immutable."
+                                        items:
+                                          description: ResourceClaim references one
+                                            entry in PodSpec.ResourceClaims.
+                                          properties:
+                                            name:
+                                              description: Name must match the name
+                                                of one entry in pod.spec.resourceClaims
+                                                of the Pod where this field is used.
+                                                It makes that resource available inside
+                                                a container.
+                                              type: string
+                                          required:
+                                          - name
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-map-keys:
+                                        - name
+                                        x-kubernetes-list-type: map
                                       limits:
                                         additionalProperties:
                                           anyOf:
@@ -714,6 +761,26 @@ spec:
                   k8s format in the event that they omitted from a PodSpec inside
                   a ClowdApp.
                 properties:
+                  claims:
+                    description: "Claims lists the names of resources, defined in
+                      spec.resourceClaims, that are used by this container. \n This
+                      is an alpha field and requires enabling the DynamicResourceAllocation
+                      feature gate. \n This field is immutable."
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: Name must match the name of one entry in pod.spec.resourceClaims
+                            of the Pod where this field is used. It makes that resource
+                            available inside a container.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
                   limits:
                     additionalProperties:
                       anyOf:

controllers/cloud.redhat.com/clowdapp_reconciliation.go

@@ -249,8 +249,18 @@ func (r *ClowdAppReconciliation) isEnvReady() (ctrl.Result, error) {
 	return ctrl.Result{}, nil
 }
 
+var applyOrder = []string{
+	"*",
+	"Service",
+	"Secret",
+	"Deployment",
+	"Job",
+	"CronJob",
+	"ScaledObject",
+}
+
 func (r *ClowdAppReconciliation) createCache() (ctrl.Result, error) {
-	cacheConfig := rc.NewCacheConfig(Scheme, nil, ProtectedGVKs, rc.Options{StrictGVK: true, DebugOptions: DebugOptions})
+	cacheConfig := rc.NewCacheConfig(Scheme, nil, ProtectedGVKs, rc.Options{StrictGVK: true, DebugOptions: DebugOptions, Ordering: applyOrder})
 	cache := rc.NewObjectCache(r.ctx, r.client, r.log, cacheConfig)
 	r.cache = &cache
 	return ctrl.Result{}, nil

controllers/cloud.redhat.com/clowdenvironment_controller.go

@@ -149,7 +149,7 @@ func (r *ClowdEnvironmentReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	}
 
 	ctx = context.WithValue(ctx, errors.ClowdKey("obj"), &env)
-	cacheConfig := rc.NewCacheConfig(Scheme, nil, ProtectedGVKs, rc.Options{StrictGVK: true, DebugOptions: DebugOptions})
+	cacheConfig := rc.NewCacheConfig(Scheme, nil, ProtectedGVKs, rc.Options{StrictGVK: true, DebugOptions: DebugOptions, Ordering: applyOrder})
 	cache := rc.NewObjectCache(ctx, r.Client, &log, cacheConfig)
 
 	r.initMetrics(env)

controllers/cloud.redhat.com/clowdjobinvocation_controller.go

@@ -76,7 +76,7 @@ func (r *ClowdJobInvocationReconciler) Reconcile(ctx context.Context, req ctrl.R
 		return ctrl.Result{}, err
 	}
 
-	cacheConfig := rc.NewCacheConfig(Scheme, nil, ProtectedGVKs, rc.Options{StrictGVK: true, DebugOptions: DebugOptions})
+	cacheConfig := rc.NewCacheConfig(Scheme, nil, ProtectedGVKs, rc.Options{StrictGVK: true, DebugOptions: DebugOptions, Ordering: applyOrder})
 	cache := rc.NewObjectCache(ctx, r.Client, &log, cacheConfig)
 	cache.AddPossibleGVKFromIdent(
 		iqe.IqeSecret,

controllers/cloud.redhat.com/providers/autoscaler/keda.go

@@ -82,7 +82,7 @@ func getTriggerRoute(triggerType string, c *config.AppConfig, env *crd.ClowdEnvi
 	case "kafka":
 		result["bootstrapServers"] = fmt.Sprintf("%s:%d", c.Kafka.Brokers[0].Hostname, *c.Kafka.Brokers[0].Port)
 	case "prometheus":
-		result["serverAddress"] = env.Status.Prometheus.Hostname
+		result["serverAddress"] = "http://" + env.Status.Prometheus.Hostname + ":9090"
 
 	// The following are the possible triggers for the keda autoscaler.
 	// See https://github.com/kedacore/keda/blob/main/pkg/scaling/scale_handler.go#L313.

controllers/cloud.redhat.com/providers/kafka/strimzi.go

@@ -181,7 +181,7 @@ func (s *strimziProvider) configureKafkaCluster() error {
 
 	version := s.Env.Spec.Providers.Kafka.Cluster.Version
 	if version == "" {
-		version = "3.1.0"
+		version = "3.4.0"
 	}
 
 	deleteClaim := s.Env.Spec.Providers.Kafka.Cluster.DeleteClaim
@@ -510,9 +510,11 @@ func (s *strimziProvider) createKafkaConnectUser() error {
 		topic := "*"
 		patternType := strimzi.KafkaUserSpecAuthorizationAclsElemResourcePatternTypeLiteral
 
+		all := strimzi.KafkaUserSpecAuthorizationAclsElemOperationAll
+
 		ku.Spec.Authorization.Acls = append(ku.Spec.Authorization.Acls, strimzi.KafkaUserSpecAuthorizationAclsElem{
 			Host:      &address,
-			Operation: strimzi.KafkaUserSpecAuthorizationAclsElemOperationAll,
+			Operation: &all,
 			Resource: strimzi.KafkaUserSpecAuthorizationAclsElemResource{
 				Name:        &topic,
 				PatternType: &patternType,
@@ -523,7 +525,7 @@ func (s *strimziProvider) createKafkaConnectUser() error {
 		group := "*"
 		ku.Spec.Authorization.Acls = append(ku.Spec.Authorization.Acls, strimzi.KafkaUserSpecAuthorizationAclsElem{
 			Host:      &address,
-			Operation: strimzi.KafkaUserSpecAuthorizationAclsElemOperationAll,
+			Operation: &all,
 			Resource: strimzi.KafkaUserSpecAuthorizationAclsElemResource{
 				Name:        &group,
 				PatternType: &patternType,
@@ -595,7 +597,7 @@ func (s *strimziProvider) configureKafkaConnectCluster(configs *config.KafkaConf
 
 	version := s.Env.Spec.Providers.Kafka.Connect.Version
 	if version == "" {
-		version = "3.1.0"
+		version = "3.4.0"
 	}
 
 	image := s.Env.Spec.Providers.Kafka.Connect.Image
@@ -890,13 +892,14 @@ func (s *strimziProvider) createKafkaUser(app *crd.ClowdApp) error {
 
 	address := "*"
 	patternType := strimzi.KafkaUserSpecAuthorizationAclsElemResourcePatternTypeLiteral
+	all := strimzi.KafkaUserSpecAuthorizationAclsElemOperationAll
 
 	for _, topic := range app.Spec.KafkaTopics {
 		topicName := getTopicName(topic, *s.Env, app.Namespace)
 
 		ku.Spec.Authorization.Acls = append(ku.Spec.Authorization.Acls, strimzi.KafkaUserSpecAuthorizationAclsElem{
 			Host:      &address,
-			Operation: strimzi.KafkaUserSpecAuthorizationAclsElemOperationAll,
+			Operation: &all,
 			Resource: strimzi.KafkaUserSpecAuthorizationAclsElemResource{
 				Name:        &topicName,
 				PatternType: &patternType,
@@ -908,7 +911,7 @@ func (s *strimziProvider) createKafkaUser(app *crd.ClowdApp) error {
 	group := "*"
 	ku.Spec.Authorization.Acls = append(ku.Spec.Authorization.Acls, strimzi.KafkaUserSpecAuthorizationAclsElem{
 		Host:      &address,
-		Operation: strimzi.KafkaUserSpecAuthorizationAclsElemOperationAll,
+		Operation: &all,
 		Resource: strimzi.KafkaUserSpecAuthorizationAclsElemResource{
 			Name:        &group,
 			PatternType: &patternType,

controllers/cloud.redhat.com/providers/objectstore/minio_test.go

@@ -165,15 +165,23 @@ func (fc *FakeClient) RESTMapper() meta.RESTMapper {
 	return nil
 }
 
+func (fc *FakeClient) SubResource(_ string) client.SubResourceClient {
+	return nil
+}
+
 func (fc *FakeClient) Status() client.StatusWriter {
 	return &FakeStatus{}
 }
 
-func (fc *FakeStatus) Update(_ context.Context, _ client.Object, _ ...client.UpdateOption) error {
+func (fc *FakeStatus) Patch(_ context.Context, _ client.Object, _ client.Patch, _ ...client.SubResourcePatchOption) error {
+	return nil
+}
+
+func (fc *FakeStatus) Create(_ context.Context, _ client.Object, _ client.Object, _ ...client.SubResourceCreateOption) error {
 	return nil
 }
 
-func (fc *FakeStatus) Patch(_ context.Context, _ client.Object, _ client.Patch, _ ...client.PatchOption) error {
+func (fc *FakeStatus) Update(_ context.Context, _ client.Object, _ ...client.SubResourceUpdateOption) error {
 	return nil
 }