diff --git a/amqp.reflect/README.md b/amqp.reflect/README.md index 4cbc61e1..875f5bc6 100644 --- a/amqp.reflect/README.md +++ b/amqp.reflect/README.md @@ -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+ diff --git a/amqp.reflect/setup.sh b/amqp.reflect/setup.sh index 5005ac0c..fe2f9fa3 100755 --- a/amqp.reflect/setup.sh +++ b/amqp.reflect/setup.sh @@ -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 diff --git a/amqp.reflect/values.yaml b/amqp.reflect/values.yaml index 26ef249f..8933c31e 100644 --- a/amqp.reflect/values.yaml +++ b/amqp.reflect/values.yaml @@ -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 diff --git a/http.kafka.schema.registry/values.yaml b/http.kafka.schema.registry/values.yaml index e6491d24..a0e17250 100644 --- a/http.kafka.schema.registry/values.yaml +++ b/http.kafka.schema.registry/values.yaml @@ -1,9 +1,8 @@ -image: - tag: develop-SNAPSHOT - extraEnv: - name: KEYSTORE_PASSWORD value: generated + - name: JAVA_OPTIONS + value: "-Dzilla.incubator.enabled=true" livenessProbePort: 7114 readinessProbePort: 7114 diff --git a/http.proxy.schema.inline/values.yaml b/http.proxy.schema.inline/values.yaml index 089ab6e9..aa8bddd0 100644 --- a/http.proxy.schema.inline/values.yaml +++ b/http.proxy.schema.inline/values.yaml @@ -1,9 +1,8 @@ -image: - tag: develop-SNAPSHOT - extraEnv: - name: KEYSTORE_PASSWORD value: generated + - name: JAVA_OPTIONS + value: "-Dzilla.incubator.enabled=true" livenessProbePort: 7143 readinessProbePort: 7143 diff --git a/mqtt.kafka.broker.jwt/values.yaml b/mqtt.kafka.broker.jwt/values.yaml index c98a5ad8..4c54afc4 100644 --- a/mqtt.kafka.broker.jwt/values.yaml +++ b/mqtt.kafka.broker.jwt/values.yaml @@ -1,5 +1,3 @@ -args: ["start", "-v", "-e"] - extraEnv: - name: KEYSTORE_PASSWORD value: generated diff --git a/mqtt.kafka.broker/k8s/helm/teardown.sh b/mqtt.kafka.broker/k8s/helm/teardown.sh index 383d2734..570e7c63 100755 --- a/mqtt.kafka.broker/k8s/helm/teardown.sh +++ b/mqtt.kafka.broker/k8s/helm/teardown.sh @@ -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 diff --git a/mqtt.kafka.broker/k8s/helm/values.yaml b/mqtt.kafka.broker/k8s/helm/values.yaml index 5f0e5a75..d250a9dc 100644 --- a/mqtt.kafka.broker/k8s/helm/values.yaml +++ b/mqtt.kafka.broker/k8s/helm/values.yaml @@ -1,5 +1,3 @@ -args: ["start", "-v", "-e"] - extraEnv: - name: KEYSTORE_PASSWORD value: generated diff --git a/mqtt.proxy.asyncapi/README.md b/mqtt.proxy.asyncapi/README.md index cf2fea84..6cd8259e 100644 --- a/mqtt.proxy.asyncapi/README.md +++ b/mqtt.proxy.asyncapi/README.md @@ -8,7 +8,7 @@ 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 ``` @@ -16,7 +16,6 @@ cat asyncapi.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+ diff --git a/mqtt.proxy.asyncapi/setup.sh b/mqtt.proxy.asyncapi/setup.sh index 11ec26e4..9ab9e1ec 100755 --- a/mqtt.proxy.asyncapi/setup.sh +++ b/mqtt.proxy.asyncapi/setup.sh @@ -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 diff --git a/mqtt.proxy.asyncapi/values.yaml b/mqtt.proxy.asyncapi/values.yaml index cb4233f9..e6ab865b 100644 --- a/mqtt.proxy.asyncapi/values.yaml +++ b/mqtt.proxy.asyncapi/values.yaml @@ -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