diff --git a/Makefile b/Makefile index ec8491e..faedc86 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ package: bundle: uds create bundle --confirm +.PHONY: build +build: package bundle + .PHONY: deploy deploy: uds deploy bundle/uds-bundle-socketzero-arm64-dev.tar.zst --confirm --set config="$(cat config.json)" diff --git a/README.md b/README.md index 3f6b89d..f2ef009 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,35 @@ uds create bundle --confirm ### To deploy the UDS package. +SocketZero ships we a free trial license up to 5 concurrent connections. If you'd like to use SocketZero beyond this, please contact support@radiusmethod.com, to discuss increased license terms. + ```shell -uds deploy bundle/uds-bundle-socketzero-arm64-0.0.1.tar.zst --confirm --set socketzero_license_org="" --set socketzero_license_key="" --set socketzero_config="$(cat config.json | base64)" +uds deploy bundle/uds-bundle-socketzero-arm64-0.0.1.tar.zst --confirm --set socketzero_license_org="" --set socketzero_license_key="" --set socketzero_config="$(cat config.json | base64)" --set redis_password="" ``` -### To test remotely +### Configuration File Sample -Copy the remote kubeconfig locally. +This sample config.json will allow you to connect to the internal redis database that is used by SocketZero. -```shell -ssh -l 127.0.0.1:6550:127.0.0.1:6550 user@remote-ip -i ~/.ssh/key.pem ``` +{ + "authz": false, + "cookie": "__Host-uds-package-socketzero-authservice-session-id-cookie", + "redisHost": "socketzero-redis-bb-master.socketzero.svc.cluster.local:6379", + "redisPassword": "", + "tunnels": [ + { + "hostname": "redis.uds.dev", + "listenPort": 6379, + "targetPort": 6379, + "targetHost": "socketzero-redis-bb-master.socketzero.svc.cluster.local", + "transport": "tcp", + "friendlyName": "Redis", + "iconUrl": "", + "action": "command", + "roles": ["redis"], + "details":["redis-cli -h redis.uds.dev"] + } + ] +} +``` \ No newline at end of file diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 8384e83..af27013 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -25,3 +25,7 @@ packages: - name: SOCKETZERO_LICENSE_KEY path: "license.key" description: "Set the key for the license" + - name: REDIS_PASSWORD + path: "global.redis.password" + description: "Redis password (required for upgrades)" + default: "helloworld" diff --git a/common/zarf.yaml b/common/zarf.yaml index cd2c586..26d616c 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -16,6 +16,8 @@ variables: description: "Organization name for the license" - name: SOCKETZERO_LICENSE_KEY description: "License key for SocketZero" + - name: REDIS_PASSWORD + description: "Redis password (required for upgrades)" components: - name: socketzero @@ -29,7 +31,7 @@ components: namespace: socketzero url: https://github.com/radiusmethod/socketzero-helm.git gitPath: . - version: 0.6.2 + version: 0.7.0 valuesFiles: - ../values/common-values.yaml actions: diff --git a/values/common-values.yaml b/values/common-values.yaml index 9f8f116..d4f55dc 100644 --- a/values/common-values.yaml +++ b/values/common-values.yaml @@ -11,4 +11,7 @@ license: config: "###ZARF_VAR_SOCKETZERO_CONFIG###" redis: auth: - password: "helloworld" + password: "###ZARF_VAR_REDIS_PASSWORD###" +global: + redis: + password: "###ZARF_VAR_REDIS_PASSWORD###" diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml index 9d7f851..d72dd2e 100644 --- a/values/registry1-values.yaml +++ b/values/registry1-values.yaml @@ -6,4 +6,4 @@ # Example variables from UDS package repo template. Update to relevant variables after templating image: repository: registry1.dso.mil/ironbank/radiusmethod/socketzero/receiver - tag: 0.6.2 + tag: 0.7.0 diff --git a/zarf.yaml b/zarf.yaml index 91ded27..3b371d6 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -23,6 +23,9 @@ variables: description: "Organization name for the license" - name: SOCKETZERO_LICENSE_KEY description: "License key for SocketZero" + - name: REDIS_PASSWORD + description: "Redis password (required for upgrades)" + default: "helloworld" components: - name: socketzero @@ -33,5 +36,5 @@ components: charts: - name: socketzero images: - - registry1.dso.mil/ironbank/radiusmethod/socketzero/receiver:0.6.2 - - registry1.dso.mil/ironbank/bitnami/redis:8.0.3 + - registry1.dso.mil/ironbank/radiusmethod/socketzero/receiver:0.7.0 + - registry1.dso.mil/ironbank/bitnami/redis:8.2.0