Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

replace local build references with incubator java prop #108

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion amqp.reflect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Listens on amqps port `7171` and will echo back whatever is sent to the server,
### Requirements

- bash, jq, nc
- Zilla docker image local incubator build, `develop-SNAPSHOT` version
- Kubernetes (e.g. Docker Desktop with Kubernetes enabled)
- kubectl
- helm 3.0+
Expand Down
3 changes: 0 additions & 3 deletions amqp.reflect/setup.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#!/bin/bash
set -ex

# Verify zilla:develop-SNAPSHOT image already available locally
docker image inspect ghcr.io/aklivity/zilla:develop-SNAPSHOT --format 'Image Found {{.RepoTags}}'

# Install Zilla to the Kubernetes cluster with helm and wait for the pod to start up
ZILLA_CHART=oci://ghcr.io/aklivity/charts/zilla
NAMESPACE=zilla-amqp-reflect
Expand Down
5 changes: 2 additions & 3 deletions amqp.reflect/values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
image:
tag: develop-SNAPSHOT

extraEnv:
- name: KEYSTORE_PASSWORD
value: generated
- name: JAVA_OPTIONS
value: "-Dzilla.incubator.enabled=true"

livenessProbePort: 7171
readinessProbePort: 7171
Expand Down
2 changes: 0 additions & 2 deletions mqtt.kafka.broker.jwt/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
args: ["start", "-v", "-e"]

extraEnv:
- name: KEYSTORE_PASSWORD
value: generated
Expand Down
2 changes: 1 addition & 1 deletion mqtt.kafka.broker/k8s/helm/teardown.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ pgrep kubectl && killall kubectl

# Uninstall Zilla and Kafka
NAMESPACE=zilla-mqtt-kafka-broker
helm uninstall zilla kafka --namespace $NAMESPACE
helm uninstall zilla --namespace $NAMESPACE
kubectl delete namespace $NAMESPACE
2 changes: 0 additions & 2 deletions mqtt.kafka.broker/k8s/helm/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
args: ["start", "-v", "-e"]

extraEnv:
- name: KEYSTORE_PASSWORD
value: generated
Expand Down
3 changes: 1 addition & 2 deletions mqtt.proxy.asyncapi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ For example:

```bash
cat asyncapi.yaml | \
docker run -i ghcr.io/aklivity/zilla:develop-SNAPSHOT \
docker run --rm -e JAVA_OPTIONS='-Dzilla.incubator.enabled=true' -i ghcr.io/aklivity/zilla \
generate --template asyncapi.mqtt.proxy --input /dev/stdin --output /dev/stdout | \
tee zilla.yaml
```

### Requirements

- bash, jq, nc
- Zilla docker image local incubator build, `develop-SNAPSHOT` version
- Kubernetes (e.g. Docker Desktop with Kubernetes enabled)
- kubectl
- helm 3.0+
Expand Down
3 changes: 0 additions & 3 deletions mqtt.proxy.asyncapi/setup.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#!/bin/bash
set -ex

# Verify zilla:develop-SNAPSHOT image already available locally
docker image inspect ghcr.io/aklivity/zilla:develop-SNAPSHOT --format 'Image Found {{.RepoTags}}'

# Install Zilla to the Kubernetes cluster with helm and wait for the pod to start up
ZILLA_CHART=oci://ghcr.io/aklivity/charts/zilla
NAMESPACE=mqtt-proxy-asyncapi
Expand Down
7 changes: 2 additions & 5 deletions mqtt.proxy.asyncapi/values.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
image:
tag: develop-SNAPSHOT

args: ["start", "-v", "-e"]

extraEnv:
- name: MOSQUITTO_BROKER_HOST
value: mosquitto
- name: MOSQUITTO_BROKER_PORT
value: "1883"
- name: JAVA_OPTIONS
value: "-Dzilla.incubator.enabled=true"

livenessProbePort: 7183
readinessProbePort: 7183
Expand Down