This is an automated email from the ASF dual-hosted git repository.
joshfischer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new f5316ec links (#3694)
f5316ec is described below
commit f5316ec93582ecaca97126e72a9ac7c447d64bf0
Author: Josh Fischer <[email protected]>
AuthorDate: Sun May 23 08:46:21 2021 -0500
links (#3694)
---
deploy/docker/sandbox.sh | 2 +-
deploy/kubernetes/general/apiserver.yaml | 4 ++--
deploy/kubernetes/general/tools.yaml | 4 ++--
deploy/kubernetes/general/zookeeper.yaml | 2 +-
deploy/kubernetes/gke/gcs-apiserver.yaml | 4 ++--
deploy/kubernetes/helm/values.yaml.template | 2 +-
deploy/kubernetes/minikube/apiserver.yaml | 4 ++--
deploy/kubernetes/minikube/tools.yaml | 4 ++--
deploy/kubernetes/minikube/zookeeper.yaml | 2 +-
docker/scripts/build-base.sh | 8 ++++----
docker/scripts/build-docker.sh | 4 ++--
heron/config/src/yaml/conf/kubernetes/scheduler.yaml | 2 +-
heron/config/src/yaml/conf/nomad/scheduler.yaml | 2 +-
.../src/java/org/apache/heron/scheduler/nomad/NomadContext.java | 2 +-
scripts/images/BUILD | 2 +-
scripts/release/docker-images | 2 +-
scripts/travis/k8s.sh | 2 +-
website2/docs/schedulers-k8s-by-hand.md | 2 +-
website2/docs/schedulers-nomad.md | 2 +-
.../version-0.20.0-incubating/schedulers-k8s-by-hand.md | 2 +-
.../versioned_docs/version-0.20.0-incubating/schedulers-nomad.md | 2 +-
.../versioned_docs/version-0.20.2-incubating/schedulers-nomad.md | 2 +-
.../versioned_docs/version-0.20.3-incubating/schedulers-nomad.md | 2 +-
23 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/deploy/docker/sandbox.sh b/deploy/docker/sandbox.sh
index 463516c..d8630a4 100755
--- a/deploy/docker/sandbox.sh
+++ b/deploy/docker/sandbox.sh
@@ -72,7 +72,7 @@ check_docker_install
case $1 in
start)
- DOCKER_IMAGE=${2:-heron/heron:latest}
+ DOCKER_IMAGE=${2:-apache/heron:latest}
sandbox_start $DOCKER_IMAGE
;;
ps)
diff --git a/deploy/kubernetes/general/apiserver.yaml
b/deploy/kubernetes/general/apiserver.yaml
index 21458f0..9d63b92 100644
--- a/deploy/kubernetes/general/apiserver.yaml
+++ b/deploy/kubernetes/general/apiserver.yaml
@@ -81,7 +81,7 @@ spec:
command: ['sh', '-c', '/opt/bookkeeper/bin/dlog admin bind -l
/ledgers -s zookeeper:2181 -c distributedlog://zookeeper:2181/heron']
containers:
- name: heron-apiserver
- image: heron/heron:latest
+ image: apache/heron:latest
command: ["sh", "-c"]
args:
- >-
@@ -90,7 +90,7 @@ spec:
--cluster kubernetes
-D heron.statemgr.connection.string=zookeeper:2181
-D heron.kubernetes.scheduler.uri=http://localhost:8001
- -D heron.executor.docker.image=heron/heron:latest
+ -D heron.executor.docker.image=apache/heron:latest
-D heron.class.uploader=org.apache.heron.uploader.dlog.DLUploader
-D
heron.uploader.dlog.topologies.namespace.uri=distributedlog://zookeeper:2181/heron
-D
heron.statefulstorage.classname=org.apache.heron.statefulstorage.dlog.DlogStorage
diff --git a/deploy/kubernetes/general/tools.yaml
b/deploy/kubernetes/general/tools.yaml
index 029b5a8..b650e04 100644
--- a/deploy/kubernetes/general/tools.yaml
+++ b/deploy/kubernetes/general/tools.yaml
@@ -48,7 +48,7 @@ spec:
tolerationSeconds: 10
containers:
- name: heron-tracker
- image: heron/heron:latest
+ image: apache/heron:latest
ports:
- containerPort: 8888
name: api-port
@@ -68,7 +68,7 @@ spec:
cpu: "400m"
memory: "512M"
- name: heron-ui
- image: heron/heron:latest
+ image: apache/heron:latest
ports:
- containerPort: 8889
name: app-port
diff --git a/deploy/kubernetes/general/zookeeper.yaml
b/deploy/kubernetes/general/zookeeper.yaml
index b159593..a283e97 100644
--- a/deploy/kubernetes/general/zookeeper.yaml
+++ b/deploy/kubernetes/general/zookeeper.yaml
@@ -70,7 +70,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: zookeeper
- image: heron/heron:latest
+ image: apache/heron:latest
command: ["sh", "-c"]
args:
- >
diff --git a/deploy/kubernetes/gke/gcs-apiserver.yaml
b/deploy/kubernetes/gke/gcs-apiserver.yaml
index c37c6ee..2a84be1 100644
--- a/deploy/kubernetes/gke/gcs-apiserver.yaml
+++ b/deploy/kubernetes/gke/gcs-apiserver.yaml
@@ -81,7 +81,7 @@ spec:
secretName: heron-gcs-key
containers:
- name: heron-apiserver
- image: heron/heron:latest
+ image: apache/heron:latest
command: ["sh", "-c"]
args:
- >-
@@ -90,7 +90,7 @@ spec:
--cluster kubernetes
-D heron.statemgr.connection.string=zookeeper:2181
-D heron.kubernetes.scheduler.uri=http://localhost:8001
- -D heron.executor.docker.image=heron/heron:latest
+ -D heron.executor.docker.image=apache/heron:latest
-D heron.class.uploader=org.apache.heron.uploader.gcs.GcsUploader
-D heron.uploader.gcs.bucket=$GCS_BUCKET
volumeMounts:
diff --git a/deploy/kubernetes/helm/values.yaml.template
b/deploy/kubernetes/helm/values.yaml.template
index 9484d98..ddb0e22 100644
--- a/deploy/kubernetes/helm/values.yaml.template
+++ b/deploy/kubernetes/helm/values.yaml.template
@@ -28,7 +28,7 @@
platform: minikube
# Heron image to use
-image: heron/heron:VERSION
+image: apache/heron:VERSION
# Heron image pull policy
imagePullPolicy: IfNotPresent
diff --git a/deploy/kubernetes/minikube/apiserver.yaml
b/deploy/kubernetes/minikube/apiserver.yaml
index 662ed10..81bd799 100644
--- a/deploy/kubernetes/minikube/apiserver.yaml
+++ b/deploy/kubernetes/minikube/apiserver.yaml
@@ -67,7 +67,7 @@ spec:
command: ['sh', '-c', '/opt/bookkeeper/bin/dlog admin bind -l
/ledgers -s zookeeper:2181 -c distributedlog://zookeeper:2181/heronbkdl']
containers:
- name: heron-apiserver
- image: heron/heron:latest
+ image: apache/heron:latest
command: ["sh", "-c"]
args:
- >-
@@ -76,7 +76,7 @@ spec:
--cluster kubernetes
-D heron.statemgr.connection.string=zookeeper:2181
-D heron.kubernetes.scheduler.uri=http://localhost:8001
- -D heron.executor.docker.image=heron/heron:latest
+ -D heron.executor.docker.image=apache/heron:latest
-D heron.class.uploader=org.apache.heron.uploader.dlog.DLUploader
-D heron.uploader.dlog.topologies.num.replicas=1
-D
heron.uploader.dlog.topologies.namespace.uri=distributedlog://zookeeper:2181/heronbkdl
diff --git a/deploy/kubernetes/minikube/tools.yaml
b/deploy/kubernetes/minikube/tools.yaml
index ce584ca..714183d 100644
--- a/deploy/kubernetes/minikube/tools.yaml
+++ b/deploy/kubernetes/minikube/tools.yaml
@@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: heron-tracker
- image: heron/heron:latest
+ image: apache/heron:latest
ports:
- containerPort: 8888
name: api-port
@@ -54,7 +54,7 @@ spec:
cpu: "400m"
memory: "512M"
- name: heron-ui
- image: heron/heron:latest
+ image: apache/heron:latest
ports:
- containerPort: 8889
name: app-port
diff --git a/deploy/kubernetes/minikube/zookeeper.yaml
b/deploy/kubernetes/minikube/zookeeper.yaml
index 779db9d..51129ce 100644
--- a/deploy/kubernetes/minikube/zookeeper.yaml
+++ b/deploy/kubernetes/minikube/zookeeper.yaml
@@ -57,7 +57,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: zookeeper
- image: heron/heron:latest
+ image: apache/heron:latest
command: ["sh", "-c"]
args:
- >
diff --git a/docker/scripts/build-base.sh b/docker/scripts/build-base.sh
index 5758f99..9745062 100755
--- a/docker/scripts/build-base.sh
+++ b/docker/scripts/build-base.sh
@@ -60,12 +60,12 @@ run_build() {
DOCKER_LATEST_TAG="heron/base:latest"
if [ "$TARGET_PLATFORM" == "debian9" ]; then
- DOCKER_TAG="heron/base:$HERON_VERSION"
- DOCKER_LATEST_TAG="heron/base:latest"
+ DOCKER_TAG="apache/heron:$HERON_VERSION"
+ DOCKER_LATEST_TAG="apache/heron:latest"
DOCKER_IMAGE_FILE="$OUTPUT_DIRECTORY/base-$HERON_VERSION.tar"
else
- DOCKER_TAG="heron/heron-$TARGET_PLATFORM:$HERON_VERSION"
- DOCKER_LATEST_TAG="heron/base-$TARGET_PLATFORM:latest"
+ DOCKER_TAG="apache/heron-$TARGET_PLATFORM:$HERON_VERSION"
+ DOCKER_LATEST_TAG="apache/heron-$TARGET_PLATFORM:latest"
DOCKER_IMAGE_FILE="$OUTPUT_DIRECTORY/base-$TARGET_PLATFORM-$HERON_VERSION.tar"
fi
diff --git a/docker/scripts/build-docker.sh b/docker/scripts/build-docker.sh
index 09c074d..aed0bff 100755
--- a/docker/scripts/build-docker.sh
+++ b/docker/scripts/build-docker.sh
@@ -61,8 +61,8 @@ run_build() {
echo $DOCKER_SQUASH
DOCKER_FILE="$SCRATCH_DIR/dist/Dockerfile.dist.$TARGET_PLATFORM"
- DOCKER_TAG="heron/heron:$HERON_VERSION"
- DOCKER_LATEST_TAG="heron/heron:latest"
+ DOCKER_TAG="apache/heron:$HERON_VERSION"
+ DOCKER_LATEST_TAG="apache/heron:latest"
setup_scratch_dir $SCRATCH_DIR
diff --git a/heron/config/src/yaml/conf/kubernetes/scheduler.yaml
b/heron/config/src/yaml/conf/kubernetes/scheduler.yaml
index cbfaf3c..b968f02 100644
--- a/heron/config/src/yaml/conf/kubernetes/scheduler.yaml
+++ b/heron/config/src/yaml/conf/kubernetes/scheduler.yaml
@@ -31,7 +31,7 @@ heron.kubernetes.scheduler.uri:
<kubernetes_api_addr>
heron.scheduler.is.service: False
# docker repo for executor
-heron.executor.docker.image: 'heron/heron:latest'
+heron.executor.docker.image: 'apache/heron:latest'
# logic to be used for calculating the Kubernetes resource request and limits
# value can be "NOT_SET", "EQUAL_TO_LIMIT"
diff --git a/heron/config/src/yaml/conf/nomad/scheduler.yaml
b/heron/config/src/yaml/conf/nomad/scheduler.yaml
index 0ffd281..644f0fe 100644
--- a/heron/config/src/yaml/conf/nomad/scheduler.yaml
+++ b/heron/config/src/yaml/conf/nomad/scheduler.yaml
@@ -42,7 +42,7 @@ heron.nomad.core.freq.mapping: 2000
heron.nomad.driver: "docker"
# The docker image to use for heron if the docker driver is used,
-heron.executor.docker.image: 'heron/heron:latest'
+heron.executor.docker.image: 'apache/heron:latest'
# Set networking mode networking when driver is docker
heron.nomad.network.mode: "default"
diff --git
a/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadContext.java
b/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadContext.java
index df8bc32..371e66d 100644
---
a/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadContext.java
+++
b/heron/schedulers/src/java/org/apache/heron/scheduler/nomad/NomadContext.java
@@ -74,7 +74,7 @@ public class NomadContext extends Context {
}
public static String getHeronExecutorDockerImage(Config config) {
- return config.getStringValue(HERON_EXECUTOR_DOCKER_IMAGE,
"heron/heron:latest");
+ return config.getStringValue(HERON_EXECUTOR_DOCKER_IMAGE,
"apache/heron:latest");
}
public static boolean getHeronNomadMetricsServiceRegister(Config config) {
diff --git a/scripts/images/BUILD b/scripts/images/BUILD
index df53a9e..d420136 100644
--- a/scripts/images/BUILD
+++ b/scripts/images/BUILD
@@ -43,6 +43,6 @@ container_push(
format = "Docker",
image = ":heron",
registry = "index.docker.io",
- repository = "heron/heron",
+ repository = "apache/heron",
tag = "{BUILD_USER}",
)
diff --git a/scripts/release/docker-images b/scripts/release/docker-images
index 6f778f5..78efaa7 100755
--- a/scripts/release/docker-images
+++ b/scripts/release/docker-images
@@ -20,7 +20,7 @@
"""
This script cooridnates other scripts to put together a release.
-Generated images will have a label in the form heron/heron:<tag> and will be
placed in the //distro/ directory.
+Generated images will have a label in the form apache/heron:<tag> and will be
placed in the //distro/ directory.
## Examples
diff --git a/scripts/travis/k8s.sh b/scripts/travis/k8s.sh
index 8d4c0ee..8929cb1 100755
--- a/scripts/travis/k8s.sh
+++ b/scripts/travis/k8s.sh
@@ -91,7 +91,7 @@ action "Loading heron docker image"
kind load image-archive "$heron_archive"
#image_heron="docker.io/bazel/scripts/images:heron"
#image_heron="$heron_image"
-image_heron="heron/heron:$TAG"
+image_heron="apache/heron:$TAG"
action "Loading bookkeeper image"
image_bookkeeper="docker.io/apache/bookkeeper:4.11.0"
diff --git a/website2/docs/schedulers-k8s-by-hand.md
b/website2/docs/schedulers-k8s-by-hand.md
index a540d5b..51677e5 100644
--- a/website2/docs/schedulers-k8s-by-hand.md
+++ b/website2/docs/schedulers-k8s-by-hand.md
@@ -557,7 +557,7 @@ You can configure Heron on Kubernetes using a variety of
YAML config files, list
| heron.directory.sandbox.java.home | location of java - pick it up from shell
environment | $JAVA_HOME |
| heron.kubernetes.scheduler.uri | The URI of the Kubernetes API
| |
| heron.scheduler.is.service | Invoke the IScheduler as a library
directly | false
|
-| heron.executor.docker.image | docker repo for executor
| heron/heron:latest |
+| heron.executor.docker.image | docker repo for executor
| apache/heron:latest
|
### stateful.yaml
diff --git a/website2/docs/schedulers-nomad.md
b/website2/docs/schedulers-nomad.md
index 2539833..b6d56a7 100644
--- a/website2/docs/schedulers-nomad.md
+++ b/website2/docs/schedulers-nomad.md
@@ -301,7 +301,7 @@ heron.nomad.driver: "docker"
You can also adjust which docker image to use for running Heron via the
`heron.executor.docker.image` in `~/.heron/conf/nomad/scheduler.yaml` e.g.
```yaml
-heron.executor.docker.image: 'heron/heron:latest'
+heron.executor.docker.image: 'apache/heron:latest'
```
You'll need to use a topology uploader to deploy topology packages to nodes in
your cluster. You can use one of the following uploaders:
diff --git
a/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
index cda77d0..4e6a7ca 100644
---
a/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
+++
b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
@@ -558,7 +558,7 @@ You can configure Heron on Kubernetes using a variety of
YAML config files, list
| heron.directory.sandbox.java.home | location of java - pick it up from shell
environment | $JAVA_HOME |
| heron.kubernetes.scheduler.uri | The URI of the Kubernetes API
| |
| heron.scheduler.is.service | Invoke the IScheduler as a library
directly | false
|
-| heron.executor.docker.image | docker repo for executor
| heron/heron:latest |
+| heron.executor.docker.image | docker repo for executor
| apache/heron:latest
|
### stateful.yaml
diff --git
a/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-nomad.md
b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-nomad.md
index 7557500..2db79f5 100644
---
a/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-nomad.md
+++
b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-nomad.md
@@ -302,7 +302,7 @@ heron.nomad.driver: "docker"
You can also adjust which docker image to use for running Heron via the
`heron.executor.docker.image` in `~/.heron/conf/nomad/scheduler.yaml` e.g.
```yaml
-heron.executor.docker.image: 'heron/heron:latest'
+heron.executor.docker.image: 'apache/heron:latest'
```
You'll need to use a topology uploader to deploy topology packages to nodes in
your cluster. You can use one of the following uploaders:
diff --git
a/website2/website/versioned_docs/version-0.20.2-incubating/schedulers-nomad.md
b/website2/website/versioned_docs/version-0.20.2-incubating/schedulers-nomad.md
index 8dec423..640dbeb 100644
---
a/website2/website/versioned_docs/version-0.20.2-incubating/schedulers-nomad.md
+++
b/website2/website/versioned_docs/version-0.20.2-incubating/schedulers-nomad.md
@@ -302,7 +302,7 @@ heron.nomad.driver: "docker"
You can also adjust which docker image to use for running Heron via the
`heron.executor.docker.image` in `~/.heron/conf/nomad/scheduler.yaml` e.g.
```yaml
-heron.executor.docker.image: 'heron/heron:latest'
+heron.executor.docker.image: 'apache/heron:latest'
```
You'll need to use a topology uploader to deploy topology packages to nodes in
your cluster. You can use one of the following uploaders:
diff --git
a/website2/website/versioned_docs/version-0.20.3-incubating/schedulers-nomad.md
b/website2/website/versioned_docs/version-0.20.3-incubating/schedulers-nomad.md
index 2d75cdb..7a20422 100644
---
a/website2/website/versioned_docs/version-0.20.3-incubating/schedulers-nomad.md
+++
b/website2/website/versioned_docs/version-0.20.3-incubating/schedulers-nomad.md
@@ -302,7 +302,7 @@ heron.nomad.driver: "docker"
You can also adjust which docker image to use for running Heron via the
`heron.executor.docker.image` in `~/.heron/conf/nomad/scheduler.yaml` e.g.
```yaml
-heron.executor.docker.image: 'heron/heron:latest'
+heron.executor.docker.image: 'apache/heron:latest'
```
You'll need to use a topology uploader to deploy topology packages to nodes in
your cluster. You can use one of the following uploaders:
