Skip to content

Commit

Permalink
Update Pulsar to version 3.0.1 and pulsar-client-go to v0.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
richscott committed Aug 15, 2023
1 parent 72551c6 commit 4e75fa2
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion deployment/armada-bundle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `"3.0.0"` | 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 |
Expand Down
2 changes: 1 addition & 1 deletion deployment/armada-bundle/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ pulsar:
# -- Pulsar image which contains pulsar-admin
repository: apachepulsar/pulsar
# -- Pulsar image tag
tag: 3.0.0
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`)
Expand Down
2 changes: 1 addition & 1 deletion deployment/armada-bundle/values/example.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ pulsar:
# -- Pulsar image which contains pulsar-admin
repository: apachepulsar/pulsar
# -- Pulsar image tag
tag: 3.0.0
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`)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
- kind

pulsar:
image: ${PULSAR_IMAGE:-apachepulsar/pulsar:3.0.0}
image: ${PULSAR_IMAGE:-apachepulsar/pulsar:3.0.1}
container_name: pulsar
volumes:
- ./developer/dependencies/pulsar.conf:/conf/pulsar.conf
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.0
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
Expand Down Expand Up @@ -195,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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGn
github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI=
github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/apache/pulsar-client-go v0.10.0 h1:ccwjmmaCjaE6bLYnrILpm8V4WQQ8rB3J98pOW0O2nyo=
github.com/apache/pulsar-client-go v0.10.0/go.mod h1:l9ZNSafZdle1cpyFE5CkUL3uRYJMvoHjHHLlK0kL7c8=
github.com/apache/pulsar-client-go v0.11.0 h1:fniyVbewAOcMSMLwxzhdrCFmFTorCW40jfnmQVcsrJw=
github.com/apache/pulsar-client-go v0.11.0/go.mod h1:FoijqJwgjroSKptIWp1vvK1CXs8dXnQiL8I+MHOri4A=
github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4=
github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI=
github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
Expand Down Expand Up @@ -1335,8 +1335,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
4 changes: 0 additions & 4 deletions magefiles/developer.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ func getComponentsList() []string {

// Dependencies include pulsar, postgres (v1 and v2) as well as redis.
func StartDependencies() error {
if onArm() {
os.Setenv("PULSAR_IMAGE", "richgross/pulsar:2.11.0")
}

// append "up", "-d" to the beginning of services
servicesArg := append([]string{"compose", "up", "-d"}, services...)
if err := dockerRun(servicesArg...); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ tests-e2e-setup: setup-cluster
docker run --rm -v ${PWD}:/go/src/armada -w /go/src/armada -e KUBECONFIG=/go/src/armada/.kube/config --network kind bitnami/kubectl:1.24.8 apply -f ./e2e/setup/namespace-with-anonymous-user.yaml

# Armada dependencies.
docker run -d --name pulsar -p 0.0.0.0:6650:6650 --network=kind apachepulsar/pulsar:2.9.2 bin/pulsar standalone
docker run -d --name pulsar -p 0.0.0.0:6650:6650 --network=kind apachepulsar/pulsar:3.0.1 bin/pulsar standalone
docker run -d --name redis -p=6379:6379 --network=kind redis:6.2.6
docker run -d --name postgres --network=kind -p 5432:5432 -e POSTGRES_PASSWORD=psw postgres:14.2

Expand Down

0 comments on commit 4e75fa2

Please sign in to comment.