Fix ci

streamnative · May 6, 2024 · c33c5b1 · c33c5b1
1 parent 09be565
commit c33c5b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.ci/tests/integration/cases/mongodb-source/manifests.yaml b/.ci/tests/integration/cases/mongodb-source/manifests.yaml
@@ -23,7 +23,7 @@ spec:
       cpu: "0.1"
       memory: 1G
   sourceConfig:
-    mongodb.hosts: rs0/mongo-dbz-0.mongo.default.svc.cluster.local:27017,rs0/mongo-dbz-1.mongo.default.svc.cluster.local:27017,rs0/mongo-dbz-2.mongo.default.svc.cluster.local:27017
+    mongodb.hosts: rs0/mongo-dbz-0.mongo.default.svc.cluster.local:27017
     mongodb.name: dbserver1
     mongodb.user: debezium
     mongodb.password: dbz

diff --git a/.ci/tests/integration/cases/mongodb-source/mongodb-dbz.yaml b/.ci/tests/integration/cases/mongodb-source/mongodb-dbz.yaml
@@ -35,7 +35,7 @@ spec:
     matchLabels:
       role: mongo
   serviceName: "mongo"
-  replicas: 3
+  replicas: 1
   template:
     metadata:
       labels:
@@ -44,7 +44,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: mongo
-          image: debezium/example-mongodb:2.7
+          image: debezium/example-mongodb:2.6
           env:
             - name: MONGODB_USER
               value: "debezium"

diff --git a/controllers/common.go b/controllers/common.go
@@ -121,6 +121,9 @@ func observeVPA(ctx context.Context, r client.Reader, name types.NamespacedName,
 	spec.UpdateVPAUpdatePolicy(updatePolicy, vpaSpec.ResourceUnit)
 	resourcePolicy := vpaSpec.ResourcePolicy
 	containerName := spec.GetVPAContainerName(&vpa.ObjectMeta)
+	if resourcePolicy == nil {
+		resourcePolicy = &vpav1.PodResourcePolicy{}
+	}
 	spec.UpdateResourcePolicy(resourcePolicy, containerName)
 	if !reflect.DeepEqual(updatePolicy, vpa.Spec.UpdatePolicy) ||
 		!reflect.DeepEqual(resourcePolicy, vpa.Spec.ResourcePolicy) {

diff --git a/controllers/spec/vpa.go b/controllers/spec/vpa.go
@@ -34,6 +34,9 @@ func MakeVPA(objectMeta *metav1.ObjectMeta, targetRef *autov2.CrossVersionObject
 		objectMeta.Labels[LabelCustomResourceUnit] = "true"
 	}
 	resourcePolicy := vpa.ResourcePolicy
+	if resourcePolicy == nil {
+		resourcePolicy = &vpav1.PodResourcePolicy{}
+	}
 	UpdateResourcePolicy(resourcePolicy, containerName)
 
 	return &vpav1.VerticalPodAutoscaler{