Merge pull request #715 from mbentley/6.1.0.19

Updated to 6.1.0.19; fixes #714

Author: mbentley

Dockerfile

@@ -10,7 +10,7 @@ COPY healthcheck.sh install.sh /
 ARG ARCH=amd64
 
 # install version (major.minor or full version); OMADA_URL set in install.sh
-ARG INSTALL_VER="6.0.0.25"
+ARG INSTALL_VER="6.1.0.19"
 ARG NO_MONGODB=false
 
 # optional cache busting build arg (value is not actually used anywhere)

README.md

@@ -64,9 +64,9 @@ If you don't know much about Docker or want to just get started as easily as pos
     * Included in this repo is a shell script ([mongodb8_cpu_support_check.sh](./mongodb8_cpu_support_check.sh)) which can be executed to test for the required CPU features
     * If this script indicates that your CPU is not supported, check out the [KNOWN ISSUES section on this for clean installs](./KNOWN_ISSUES.md#clean-install) for how you can proceed with the v6 controller image.
 1. **Picking an image tag**
-    * Most people will want to use a major.minor tag version (i.e. - `6.0`) as this is the safest option and can almost certainly be considered to be non-breaking when a new version of the image is available.
+    * Most people will want to use a major.minor tag version (i.e. - `6.1`) as this is the safest option and can almost certainly be considered to be non-breaking when a new version of the image is available.
     * If updating the tag between minor versions is not ideal for you, there is also the major tag version (i.e. - `5`) which should be safe from most non-breaking changes.
-    * **USING THE `latest` TAG IS A BAD IDEA - DO NOT DO IT!** Using `latest` may upgrade you to a newer version (i.e. - `5.15` to `6.0`) when it comes out and there is no guarantee that there will not be potentially breaking changes between those versions! Instead, use one of the two tag types above.
+    * **USING THE `latest` TAG IS A BAD IDEA - DO NOT DO IT!** Using `latest` may upgrade you to a newer version (i.e. - `5.15` to `6.1`) when it comes out and there is no guarantee that there will not be potentially breaking changes between those versions! Instead, use one of the two tag types above.
     * ~~If you need to create PDF reports from the controller, there are [tags with Chromium](#tags-with-chromium) as that is required to generate them. Those images are much larger and only available for `amd64` so only use them if you really need that functionality.~~ Reports are now CSV and XLSX so they do not require Chromium.
 1. **Picking your networking mode**
     * There are three main options regarding how your container is exposed to your network, which is required to manage your TP-Link Omada enabled devices:
@@ -80,11 +80,11 @@ If you don't know much about Docker or want to just get started as easily as pos
     * There are several ways to run your controller container:
         * [docker run...](#example-usage)
             * Examples for both host (_preferred_) and bridge network modes
-            * Uses the latest major.minor (i.e. - `6.0`) tag
+            * Uses the latest major.minor (i.e. - `6.1`) tag
             * Only requires Docker to be set up
         * [docker compose](#using-docker-compose)
             * Examples for both host (_preferred_) and bridge network modes
-            * Uses the latest major.minor (i.e. - `6.0`) tag
+            * Uses the latest major.minor (i.e. - `6.1`) tag
             * Requires Docker and [Docker Compose](https://docs.docker.com/compose/) to be set up
         * [k8s](#using-k8s)
             * Deployment is k8s is an advanced topic; only use this if you know what you are doing and can support yourself.
@@ -131,7 +131,8 @@ For a full tag list, search the [Docker Hub tags list](https://hub.docker.com/r/
 
 | Tag(s) | Major.Minor Release | Current Version |
 | :----- | ------------------- | --------------- |
-| `6`, `6.0` | `6.0.x` | `6.0.0.25` |
+| `6`, `6.1` | `6.1.x` | `6.1.0.19` |
+| `6.0` | `6.0.x` | `6.0.0.25` |
 | `latest`, `5`, `5.15` | `5.15.x` | `5.15.24.19` |
 
 ### Tags with Chromium
@@ -147,6 +148,7 @@ These are multi-arch tags. For the full tag listings, see the Docker Hub tags ab
 | `beta`, `beta-6.1`, `beta-6.1.0.19` | `6.1.x` Beta | `6.1.0.19` |
 | `beta-openj9`, `beta-6.1-openj9`, `beta-6.1.0.19-openj9` | `6.1.x` Beta w/OpenJ9 | `6.1.0.19` |
 | --- | --- | --- |
+| `6-openj9`, `6.1-openj9`, `6.1.0.19-openj9` | `6.1.x` w/OpenJ9 | `6.1.0.19` |
 | `6.0-openj9`, `6.0.0.25-openj9` | `6.0.x` w/OpenJ9 | `6.0.0.25` |
 | `5.15-openj9`, `5.15.24.19-openj9` | `5.15.x` w/OpenJ9 | `5.15.24.19` |
 
@@ -156,7 +158,7 @@ If for some reason you can't use the multi-arch tags, there are explicitly tagge
 
 ### Explicit Version Tags
 
-If you need a specific version of the controller, starting with 5.13 and 5.14, there are explicitly tagged images with the exact version (i.e. - `6.0.0.25`) in the tag name. Check [Docker Hub](https://hub.docker.com/r/mbentley/omada-controller/tags) for the full list of tags.
+If you need a specific version of the controller, starting with 5.13 and 5.14, there are explicitly tagged images with the exact version (i.e. - `6.1.0.19`) in the tag name. Check [Docker Hub](https://hub.docker.com/r/mbentley/omada-controller/tags) for the full list of tags.
 
 ## Archived Tags
 
@@ -227,10 +229,10 @@ There are some differences between the build steps for `amd64`, `arm64`, and `ar
   ```
   docker build \
     --build-arg BASE=mbentley/ubuntu:24.04 \
-    --build-arg INSTALL_VER="6.0.0.25" \
+    --build-arg INSTALL_VER="6.1.0.19" \
     --build-arg ARCH="amd64" \
     -f Dockerfile \
-    -t mbentley/omada-controller:6.0-amd64 .
+    -t mbentley/omada-controller:6.1-amd64 .
   ```
 
 ### `arm64`
@@ -240,10 +242,10 @@ There are some differences between the build steps for `amd64`, `arm64`, and `ar
   ```
   docker build \
     --build-arg BASE=mbentley/ubuntu:24.04 \
-    --build-arg INSTALL_VER="6.0.0.25" \
+    --build-arg INSTALL_VER="6.1.0.19" \
     --build-arg ARCH="arm64" \
     -f Dockerfile \
-    -t mbentley/omada-controller:6.0-arm64 .
+    -t mbentley/omada-controller:6.1-arm64 .
   ```
 
 ### `armv7l`
@@ -281,7 +283,7 @@ docker run -d \
   -e TZ=Etc/UTC \
   -v omada-data:/opt/tplink/EAPController/data \
   -v omada-logs:/opt/tplink/EAPController/logs \
-  mbentley/omada-controller:6.0
+  mbentley/omada-controller:6.1
 ```
 
 ### Using port mapping
@@ -306,7 +308,7 @@ docker run -d \
   -e TZ=Etc/UTC \
   -v omada-data:/opt/tplink/EAPController/data \
   -v omada-logs:/opt/tplink/EAPController/logs \
-  mbentley/omada-controller:6.0
+  mbentley/omada-controller:6.1
 ```
 
 ### Using non-default ports
@@ -370,7 +372,7 @@ The Helm charts are published to [mbentley/omada-controller-helm](https://hub.do
 | `PORT_MANAGER_V2` | `29814` | `1024`-`65535` | Omada Controller and Omada Discovery Utility manage the Omada devices running firmware fully adapted to Omada Controller v5* | >= `5.x` |
 | `PORT_TRANSFER_V2` | `29815` | `1024`-`65535` | Omada Controller receives Device Info and Packet Capture files from the Omada devices | >= `5.9` |
 | `PORT_RTTY` | `29816` | `1024`-`65535` | Omada Controller establishes the remote control terminal session with the Omada devices | >= `5.9` |
-| `PORT_DEVICE_MONITOR` | `29817` | `1024`-`65535` | Omada Controller ??? (currently unknown the full purpose) | >= `6.0` |
+| `PORT_DEVICE_MONITOR` | `29817` | `1024`-`65535` | Omada Controller ??? (currently unknown the full purpose) | >= `06.0` |
 | `PUID` | `508` | _any_ | Set the `omada` process user ID ` | >= `3.2` |
 | `PUSERNAME` | `omada` | _any_ | Set the username for the process user ID to run as | >= `5.0` |
 | `ROOTLESS` | `false` | `true`, `false` | Sets the entrypoint for [rootless mode](#running-rootless) | >= `5.14` |

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   omada-controller:
     container_name: omada-controller
-    image: mbentley/omada-controller:6.0
+    image: mbentley/omada-controller:6.1
     restart: unless-stopped
     ulimits:
       nofile:

docker-compose_bridge.yml

@@ -1,7 +1,7 @@
 services:
   omada-controller:
     container_name: omada-controller
-    image: mbentley/omada-controller:6.0
+    image: mbentley/omada-controller:6.1
     restart: unless-stopped
     ulimits:
       nofile:

helm/omada-controller-helm/Chart.yaml

@@ -3,5 +3,5 @@ name: omada-controller-helm
 description: Helm chart for deploying the TP-Link Omada SDN Controller
 icon: https://static.tp-link.com/assets/images/icon/favicon-omada.ico
 type: application
-version: 1.0.2
-appVersion: "6.0.0.25"
+version: 1.1.0
+appVersion: "6.1.0.19"

helm/omada-controller-helm/README.md

@@ -14,6 +14,7 @@ The Helm chart releases do not correspond to the controller version so below is
 
 | Controller Version | Chart Version | Change Notes |
 | ------------------ | ------------- | :------------ |
+| `6.1.0.19`         | `1.1.0`       | Updated to version 6.1.0.19 |
 | `6.0.0.25`         | `1.0.2`       | Added env var for UPGRADE_HTTPS_PORT |
 | `6.0.0.25`         | `1.0.1`       | Updated to version 6.0.0.25 |
 | `6.0.0.24`         | `1.0.0`       | Initial version |
@@ -74,6 +75,7 @@ The following table lists the configurable parameters of the Omada Controller ch
 | `config.ports.manageHttps` | Management portal HTTPS port | `8043` |
 | `config.ports.portalHttp` | Captive portal HTTP port | `8088` |
 | `config.ports.portalHttps` | Captive portal HTTPS port | `8843` |
+| `config.ports.upgradeHttps` | Dedicated HTTPS port for upgrades | `8043` |
 | `config.ports.appDiscovery` | UDP port for Omada App discovery | `27001` |
 | `config.ports.adoptV1` | Device adoption port (v1) | `29812` |
 | `config.ports.upgradeV1` | Device upgrade port (v1) | `29813` |

helm/omada-controller-helm/values.yaml

@@ -32,7 +32,7 @@ podAnnotations: {}
 # For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 podLabels: {}
 
-# Configuration options for the Omada Controller application. See the omada-controller documentation 
+# Configuration options for the Omada Controller application. See the omada-controller documentation
 # for details on these options.
 config:
   ports:
@@ -44,6 +44,8 @@ config:
     portalHttp: 8088
     # User captive portal for HTTPS
     portalHttps: 8843
+    # Dedicated HTTPS port for upgrades
+    portalHttps: 8043
     # Port for HTTPS device upgrade downloads
     upgradeHttps: 8043
     # UDP Port allowing the Omada App to discover the Controller while on the same network
@@ -66,7 +68,7 @@ config:
     rtty: 29816
     # Port used for device monitoring (New in Omada 6)
     deviceMonitor: 29817
-  
+
   # Configures the Omada Controller to run in rootless mode. When this is enabled, the pod
   # and container security contexts are set to non-root user IDs.
   rootless: true
@@ -82,7 +84,7 @@ config:
   # It is generally simpler to use a Kubernetes Ingress resource to handle TLS termination.
   sslCertName: tls.crt
   sslKeyName: tls.key
-  
+
   # Re-enables TLS 1.0 & 1.1 if set to `true`
   tls1Enabled: false
 
@@ -127,7 +129,7 @@ ingress:
     #   paths:
     #     - path: /
     #       pathType: Prefix
-  
+
   # Hosts which will redirect to the captive portal port
   portalHosts: []
     # - host: omada-portal.example.com
@@ -166,7 +168,7 @@ readinessProbe:
     scheme: HTTPS
 
 # Configure a startup probe to check when the Omada Controller is ready to serve requests.
-# Omada Controller can take a while to start up, especially on first run when it is 
+# Omada Controller can take a while to start up, especially on first run when it is
 # initializing its database. The startup probe helps Kubernetes avoid killing the pod
 # before it is ready. Once the startup probe succeeds, the liveness and readiness probes take over.
 startupProbe:
@@ -177,7 +179,7 @@ startupProbe:
   failureThreshold: 30
   periodSeconds: 10
 
-# Configure persistence settings for Omada Controller data and logs. 
+# Configure persistence settings for Omada Controller data and logs.
 # Separate volume claims are created for data and logs to allow for different
 # storage class or size settings.
 persistence:
@@ -196,7 +198,7 @@ persistence:
     accessModes:
       - ReadWriteOnce
     size: 1Gi
-  
+
   # Allows mounting additional volumes into the Omada Controller. Can be used
   # to mount TLS secrets, configmaps, or for additional customization of storage
   # instead of using the persistence.data and persistence.logs options. If running

k8s/deployment.yaml

@@ -26,7 +26,7 @@ spec:
           type: RuntimeDefault
       containers:
       - name: omada-controller
-        image: mbentley/omada-controller:6.0
+        image: mbentley/omada-controller:6.1
         imagePullPolicy: Always
         securityContext:
           allowPrivilegeEscalation: false