Skip to content

Commit

Permalink
Fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
jiangpengcheng committed Apr 7, 2024
1 parent 8ba27f4 commit a1c4df0
Show file tree
Hide file tree
Showing 18 changed files with 59 additions and 59 deletions.
18 changes: 9 additions & 9 deletions .ci/clusters/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@ monitoring:

images:
zookeeper:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
bookie:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
autorecovery:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
broker:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
functions:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
proxy:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
presto:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23

zookeeper:
Expand All @@ -73,7 +73,7 @@ bookkeeper:
replicaCount: 0
metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
configData:
PULSAR_PREFIX_autoRecoveryDaemonEnabled: "false"
Expand Down Expand Up @@ -107,7 +107,7 @@ bookkeeper:
pulsar_metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23

broker:
Expand Down
16 changes: 8 additions & 8 deletions .ci/clusters/values_cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ monitoring:

images:
zookeeper:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10
bookie:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10
autorecovery:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10
broker:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10
functions:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10
proxy:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10

zookeeper:
Expand All @@ -66,7 +66,7 @@ bookkeeper:
replicaCount: 1
metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10
configData:
# `BOOKIE_MEM` is used for `bookie shell`
Expand Down Expand Up @@ -96,7 +96,7 @@ bookkeeper:
pulsar_metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.10.0.0-rc10

broker:
Expand Down
16 changes: 8 additions & 8 deletions .ci/clusters/values_custom_runner_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,27 @@ monitoring:

images:
zookeeper:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
bookie:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
autorecovery:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
broker:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
proxy:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
functions:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent

Expand All @@ -71,7 +71,7 @@ bookkeeper:
replicaCount: 1
metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
configData:
PULSAR_PREFIX_autoRecoveryDaemonEnabled: "false"
Expand Down Expand Up @@ -108,7 +108,7 @@ bookkeeper:
pulsar_metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent

Expand Down
18 changes: 9 additions & 9 deletions .ci/clusters/values_runner_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,31 @@ monitoring:

images:
zookeeper:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
bookie:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
autorecovery:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
broker:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
proxy:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
functions:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent
presto:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent

Expand All @@ -75,7 +75,7 @@ bookkeeper:
replicaCount: 0
metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
configData:
PULSAR_PREFIX_autoRecoveryDaemonEnabled: "false"
Expand Down Expand Up @@ -109,7 +109,7 @@ bookkeeper:
pulsar_metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
pullPolicy: IfNotPresent

Expand Down
12 changes: 6 additions & 6 deletions .ci/clusters/values_skywalking_e2e_cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ monitoring:

images:
zookeeper:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
bookie:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
broker:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
functions:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23

zookeeper:
Expand All @@ -66,7 +66,7 @@ bookkeeper:
replicaCount: 0
metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
resources:
requests:
Expand Down Expand Up @@ -104,7 +104,7 @@ bookkeeper:
pulsar_metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23

broker:
Expand Down
4 changes: 2 additions & 2 deletions .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ bookkeeper:
replicaCount: 0
metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
resources:
requests:
Expand Down Expand Up @@ -104,7 +104,7 @@ bookkeeper:
pulsar_metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23

broker:
Expand Down
12 changes: 6 additions & 6 deletions .ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ monitoring:

images:
zookeeper:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
bookie:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
broker:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
functions:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23

zookeeper:
Expand All @@ -66,7 +66,7 @@ bookkeeper:
replicaCount: 0
metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23
resources:
requests:
Expand Down Expand Up @@ -104,7 +104,7 @@ bookkeeper:
pulsar_metadata:
image:
repository: streamnative/pulsar-all
repository: streamnative/sn-platform
tag: 2.9.2.23

broker:
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration-oauth2/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ setup:
- name: build images
command: |
chmod +x images/build.sh images/samples/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/pulsar-all KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/sn-platform KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 KIND_PUSH=true images/samples/build.sh
- name: install helm
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration-oauth2/e2e_with_downloader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ setup:
- name: build images
command: |
chmod +x images/build.sh images/samples/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/pulsar-all KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/sn-platform KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 KIND_PUSH=true images/samples/build.sh
- name: install helm
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ setup:
- name: build images
command: |
chmod +x images/build.sh images/samples/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/pulsar-all KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/sn-platform KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 KIND_PUSH=true images/samples/build.sh
- name: install helm
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration/e2e_with_tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ setup:
- name: build images
command: |
chmod +x images/build.sh images/samples/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/pulsar-all KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/sn-platform KIND_PUSH=true images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 KIND_PUSH=true images/samples/build.sh
- name: install helm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-function-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
env:
DOCKER_REPO: localhost:5000
run: |
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/pulsar-all KIND_PUSH=false images/build.sh
PULSAR_IMAGE_TAG=2.9.2.23 PULSAR_IMAGE=streamnative/sn-platform KIND_PUSH=false images/build.sh
- name: Verify function runner
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ test-ginkgo: generate fmt vet manifests envtest

.PHONY: envtest
envtest:
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240320141353-395cfc7486e6

# Build manager binary
manager: generate fmt vet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: default
spec:
className: org.apache.pulsar.functions.api.examples.ExclamationFunction
image: streamnative/pulsar-all:2.7.1
image: streamnative/sn-platform:2.7.1
forwardSourceMessageProperty: true
maxPendingAsyncRequests: 1000
replicas: 1
Expand Down
2 changes: 1 addition & 1 deletion images/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#
set -e

PULSAR_IMAGE=${PULSAR_IMAGE:-"streamnative/pulsar-all"}
PULSAR_IMAGE=${PULSAR_IMAGE:-"streamnative/sn-platform"}
PULSAR_IMAGE_TAG=${PULSAR_IMAGE_TAG:-"2.7.1"}
DOCKER_REPO=${DOCKER_REPO:-"streamnative"}
RUNNER_BASE="pulsar-functions-runner-base"
Expand Down
2 changes: 1 addition & 1 deletion images/samples/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
set -e

PULSAR_IMAGE_TAG=${PULSAR_IMAGE_TAG:-"2.7.1"}
PULSAR_IMAGE=${PULSAR_IMAGE:-"streamnative/pulsar-all"}
PULSAR_IMAGE=${PULSAR_IMAGE:-"streamnative/sn-platform"}
JAVA_RUNNER_IMAGE=${RUNNER_IMAGE:-"streamnative/pulsar-functions-java-runner"}
DOCKER_REPO=${DOCKER_REPO:-"streamnative"}
JAVA_SAMPLE="pulsar-functions-java-sample"
Expand Down
2 changes: 1 addition & 1 deletion images/samples/java-function-samples/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PULSAR_IMAGE_TAG
FROM streamnative/pulsar-all:${PULSAR_IMAGE_TAG} as pulsar-all
FROM streamnative/sn-platform:${PULSAR_IMAGE_TAG} as pulsar-all
FROM streamnative/pulsar-functions-java-runner:${PULSAR_IMAGE_TAG}
COPY --from=pulsar-all --chown=$UID:$GID /pulsar/examples /pulsar/examples
2 changes: 1 addition & 1 deletion images/samples/python-function-samples/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PULSAR_IMAGE_TAG
FROM streamnative/pulsar-all:${PULSAR_IMAGE_TAG} as pulsar-all
FROM streamnative/sn-platform:${PULSAR_IMAGE_TAG} as pulsar-all
FROM streamnative/pulsar-functions-python-runner:${PULSAR_IMAGE_TAG}
COPY --from=pulsar-all --chown=$UID:$GID /pulsar/examples /pulsar/examples

0 comments on commit a1c4df0

Please sign in to comment.