Upgrade to Pulsar 3.0.1 (BATCH-318)

cmd/eventsprinter/logic/logic.go

@@ -31,7 +31,12 @@ func PrintEvents(url, topic, subscription string, verbose bool) error {
 				time.Sleep(time.Second)
 				continue
 			}
-			consumer.Ack(msg)
+
+			err = consumer.Ack(msg)
+			if err != nil {
+				fmt.Println(err)
+				continue
+			}
 
 			sequence := &armadaevents.EventSequence{}
 			err = proto.Unmarshal(msg.Payload(), sequence)

deployment/armada-bundle/README.md

@@ -114,7 +114,7 @@ A helm chart which bundles Armada components
 | pulsar.armadaInit.brokerHost | string | `"pulsar-broker.armada.svc.cluster.local"` | Pulsar Broker host |
 | pulsar.armadaInit.enabled | bool | `false` | Toggle whether to enable the job which creates necessary Pulsar resources needed by Armada |
 | pulsar.armadaInit.image.repository | string | `"apachepulsar/pulsar"` | Pulsar image which contains pulsar-admin |
-| pulsar.armadaInit.image.tag | string | `"2.10.2"` | Pulsar image tag |
+| pulsar.armadaInit.image.tag | string | `"3.0.1"` | Pulsar image tag |
 | pulsar.armadaInit.port | int | `6650` | Pulsar application port |
 | pulsar.armadaInit.protocol | string | `"http"` | Protocol used for connecting to Pulsar Broker host (either `http` or `https`) |
 | pulsar.fullnameOverride | string | `"pulsar"` | Fullname override for Pulsar release |

deployment/armada-bundle/values.yaml

@@ -249,7 +249,7 @@ pulsar:
       # -- Pulsar image which contains pulsar-admin
       repository: apachepulsar/pulsar
       # -- Pulsar image tag
-      tag: 2.10.2
+      tag: 3.0.1
     # -- Pulsar Broker host
     brokerHost: pulsar-broker.armada.svc.cluster.local
     # -- Protocol used for connecting to Pulsar Broker host (either `http` or `https`)

deployment/armada-bundle/values/example.values.yaml

@@ -255,7 +255,7 @@ pulsar:
       # -- Pulsar image which contains pulsar-admin
       repository: apachepulsar/pulsar
       # -- Pulsar image tag
-      tag: 2.10.2
+      tag: 3.0.1
     # -- Pulsar Broker host
     brokerHost: pulsar-broker.armada.svc.cluster.local
     # -- Protocol used for connecting to Pulsar Broker host (either `http` or `https`)

docker-compose.yaml

@@ -34,7 +34,7 @@ services:
       - kind
 
   pulsar:
-    image: ${PULSAR_IMAGE:-apachepulsar/pulsar:2.10.4}
+    image: ${PULSAR_IMAGE:-apachepulsar/pulsar:3.0.1}
     container_name: pulsar
     volumes:
       - ./developer/dependencies/pulsar.conf:/conf/pulsar.conf

docs/developer/manual-localdev.md

@@ -8,16 +8,6 @@ For a full lust of mage commands, run `mage -l`.
 
 ## Setup
 
-### Note for Arm/M1 Mac Users
-
-You will need to set the `PULSAR_IMAGE` enviromental variable to an arm64 image.
-
-We provide an optimised image for this purpose:
-
-```bash
-export PULSAR_IMAGE=richgross/pulsar:2.11.0
-```
-
 ```bash
 # Download Go dependencies.
 go mod tidy

e2e/pulsar_test/pulsar_test.go

@@ -900,7 +900,12 @@ func receiveJobSetSequencesWithEventFilter(
 			fmt.Println("Pulsar receive error", err)
 			continue
 		}
-		consumer.Ack(msg)
+
+		err = consumer.Ack(msg)
+		if err != nil {
+			fmt.Println("Pulsar ack error", err)
+			continue
+		}
 
 		sequence := &armadaevents.EventSequence{}
 		err = proto.Unmarshal(msg.Payload(), sequence)

go.mod

@@ -10,7 +10,7 @@ replace github.com/AthenZ/athenz v1.10.39 => github.com/AthenZ/athenz v1.10.4
 require (
 	github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5
 	github.com/alicebob/miniredis v2.5.0+incompatible
-	github.com/apache/pulsar-client-go v0.8.1-0.20220429133321-5ee63303d43e
+	github.com/apache/pulsar-client-go v0.11.0
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
@@ -101,11 +101,11 @@ require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/DataDog/zstd v1.5.0 // indirect
 	github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect
-	github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect
 	github.com/ardielle/ardielle-go v1.5.2 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bits-and-blooms/bitset v1.4.0 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/caarlos0/log v0.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
@@ -168,8 +168,6 @@ require (
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.14.0 // indirect
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.19.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -197,7 +195,7 @@ require (
 	golang.org/x/text v0.7.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect