Merge branch 'main' into feature/cluster-resources

Author: nightkr

.github/workflows/pr_pre-commit.yaml

@@ -8,6 +8,7 @@ env:
   CARGO_TERM_COLOR: always
   RUST_TOOLCHAIN_VERSION: "1.80.1"
   HADOLINT_VERSION: "v2.12.0"
+  PYTHON_VERSION: "3.12"
 
 jobs:
   pre-commit:
@@ -22,29 +23,8 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
-      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+      - uses: stackabletech/actions/run-pre-commit@e8781161bc1eb037198098334cec6061fe24b6c3 # v0.0.2
         with:
-          python-version: '3.12'
-      - uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
-          components: rustfmt,clippy
-      - name: Setup Hadolint
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          LOCATION_DIR="$HOME/.local/bin"
-          LOCATION_BIN="$LOCATION_DIR/hadolint"
-
-          SYSTEM=$(uname -s)
-          ARCH=$(uname -m)
-
-          mkdir -p "$LOCATION_DIR"
-          curl -sL -o "${LOCATION_BIN}" "https://github.com/hadolint/hadolint/releases/download/${{ env.HADOLINT_VERSION }}/hadolint-$SYSTEM-$ARCH"
-          chmod 700 "${LOCATION_BIN}"
-
-          echo "$LOCATION_DIR" >> "$GITHUB_PATH"
-      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
-        with:
-          extra_args: "--from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}"
+          python-version: ${{ env.PYTHON_VERSION }}
+          rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
+          hadolint: ${{ env.HADOLINT_VERSION }}

.pre-commit-config.yaml

@@ -67,12 +67,12 @@ repos:
         name: regenerate-charts
         language: system
         entry: make regenerate-charts
-        stages: [commit, merge-commit, manual]
+        stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false
 
       - id: cargo-test
         name: cargo-test
         language: system
         entry: cargo test
-        stages: [commit, merge-commit, manual]
+        stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false

CHANGELOG.md

@@ -4,19 +4,27 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- `Listener.status.addresses` can now be configured to prefer either IP addresses or DNS hostnames ([#233]).
+
 ### Changed
 
-- Listener.status.addresses for NodePort listeners now includes replicas that are currently unavailable ([#231]).
+- `Listener.status.addresses` for NodePort listeners now includes replicas that are currently unavailable ([#231]).
+- `Listener.status.addresses` now defaults to DNS hostnames for all service types (previously NodePort and ClusterIP would prefer IP addresses, [#233]).
 - Stale Listener subobjects will now be deleted ([#232]).
 - Tagged Listener Services with the SDP labels ([#232]).
 
 ### Fixed
 
 - Listener.status.addresses is now de-duplicated ([#231]).
 - Listener controller now listens for ListenerClass updates ([#231]).
+- Propagate `ListenerClass.spec.serviceAnnotations` to the created Services ([#234]).
 
 [#231]: https://github.com/stackabletech/listener-operator/pull/231
 [#232]: https://github.com/stackabletech/listener-operator/pull/232
+[#233]: https://github.com/stackabletech/listener-operator/pull/233
+[#234]: https://github.com/stackabletech/listener-operator/pull/234
 
 ## [24.7.0] - 2024-07-24
 

Cargo.lock

@@ -21,7 +21,7 @@ prost = "0.13"
 prost-types = "0.13"
 serde = "1.0"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.76.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.78.0" }
 strum = { version = "0.26", features = ["derive"] }
 socket2 = { version = "0.5", features = ["all"] }
 tokio = { version = "1.40", features = ["full"] }
@@ -31,5 +31,6 @@ tonic-build = "0.12"
 tonic-reflection = "0.12"
 tracing = "0.1.40"
 
-# [patch."https://github.com/stackabletech/operator-rs.git"]
-# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+[patch."https://github.com/stackabletech/operator-rs.git"]
+# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
+stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }

Cargo.nix

@@ -24,6 +24,16 @@ spec:
             spec:
               description: Defines a policy for how [Listeners](https://docs.stackable.tech/home/nightly/listener-operator/listener) should be exposed. Read the [ListenerClass documentation](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass) for more information.
               properties:
+                preferredAddressType:
+                  default: Hostname
+                  description: |-
+                    Whether addresses should prefer using the IP address (`IP`) or the hostname (`Hostname`).
+
+                    The other type will be used if the preferred type is not available. By default `Hostname` is used.
+                  enum:
+                    - Hostname
+                    - IP
+                  type: string
                 serviceAnnotations:
                   additionalProperties:
                     type: string

Cargo.toml

@@ -30,6 +30,7 @@ How exactly this is accomplished depends on the cloud provider in question, but
 include::example$listenerclass-internal-gke.yaml[]
 ----
 
+[#servicetype]
 == Service types
 
 The service type is defined by `ListenerClass.spec.serviceType`.
@@ -62,6 +63,24 @@ Compared to xref:#servicetype-nodeport[], this service type allows Pods to be mo
 However, it requires https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer[a cloud controller manager that supports load balancers].
 Additionally, many cloud providers charge for load-balanced traffic.
 
+[#addresstype]
+== Address types
+
+The Stackable Listener Operator supports both IP addresses and DNS hostnames. The preferred address type for a given ListenerClass can be configured using the `ListenerClass.spec.preferredAddressType` field. If no `preferredAddressType` is specified then it defaults to xref:#addresstype-hostname[].
+
+NOTE: If the preferred address type is not supported for a given environment then another type will be used.
+
+[#addresstype-ip]
+=== IP
+
+The IP address of a resource. The addresses will be less predictable (especially for xref:#servicetype-clusterip[] services),
+but does not require any special client configuration (beyond what the xref:#servicetype[] requires).
+
+[#addresstype-hostname]
+=== Hostname
+
+The DNS hostname of a resource. Clients must be able to resolve these addresses in order to connect, which may require special DNS configuration.
+
 == Default ListenerClasses
 
 The Stackable Data Platform assumes the existence of a few predefined ListenerClasses, and will use them by default as appropriate:

crate-hashes.json

@@ -8,7 +8,7 @@ use stackable_operator::{
 };
 use tonic::{Request, Response, Status};
 
-use crate::utils::error_full_message;
+use crate::utils::error::error_full_message;
 
 use super::{tonic_unimplemented, ListenerSelector, ListenerVolumeContext};