[SA-24220] 6.3 SDP Clilent + Alpine 3.20

.github/workflows/build-push-client.yml

@@ -70,6 +70,7 @@ jobs:
           - "sdp-headless-service"
         client-version:
           - "6.2"
+          - "6.3"
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/merge.yml

@@ -9,7 +9,7 @@ jobs:
   build-push-client:
     uses: ./.github/workflows/build-push-client.yml
     with:
-      latest-version: "6.2"
+      latest-version: "6.3"
       push: true
 
   build-push-injector:

README.md

@@ -330,7 +330,7 @@ SDP Kubernetes Injector supports various annotation-based behavior customization
 |--------------------------------------------------------|----------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `k8s.appgate.com/sdp-injector.strategy`                | `enabledByDefault`, `disabledByDefault`                                    | Defines the default injection strategy of the namespace. Use this annotation with `k8s.appgate.com/sdp-injector.enabled`. If `enabledByDefault`, the Injector will always inject sidecars to deployment. If `disabledByDefault`, the Injector will only inject sidecars to deployments annotated with `k8s.appgate.com/sdp-injector.enabled`. If the annotation is not specified in the namespace, it will use `enabledByDefault`. |
 | `k8s.appgate.com/sdp-injector.enabled`                 | `true`, `false`                                                            | Defines whether the sidecar can be injected in the pod. Use this annotation with `k8s.appgate.com/sdp-injector.strategy`. In a `enabledByDefault` namespace, the default value will be `true`. In a `disabledByDefault` namespace, the default value will be `false`.                                                                                                                                                              |
-| `k8s.appgate.com/sdp-injector.client-version`          | `6.0`, `6.1`, `6.2`                                                        | Specifies the SDP Client version to inject as a sidecar. The default client version is specified by the helm value `sdp.clientVersion`. When this annotation is used on a deployment, it will override the helm value.                                                                                                                                                                                                             |
+| `k8s.appgate.com/sdp-injector.client-version`          | `6.0`, `6.1`, `6.2`, `6.3`                                                 | Specifies the SDP Client version to inject as a sidecar. The default client version is specified by the helm value `sdp.clientVersion`. When this annotation is used on a deployment, it will override the helm value.                                                                                                                                                                                                             |
 | `k8s.appgate.com/sdp-injector.disable-init-containers` | `true`, `false`                                                            | When `initContainers` are present in a pod, the Injector loads extra init-containers for DNS resolution. This annotation will disable the injection of init-containers if set to `false`                                                                                                                                                                                                                                           |
 | `k8s.appgate.com/sdp-injector.custom-dns-search`       | Space-separated string of domains (e.g. `svc.cluster.local cluster.local`) | Additional domains to the list of domains in the DNS resolution.                                                                                                                                                                                                                                                                                                                                                                   |
 
@@ -339,14 +339,14 @@ SDP Kubernetes Injector supports various annotation-based behavior customization
 ### SDP parameters
 
 | Name                                      | Description                                                                              | Value                                   |
-| ----------------------------------------- | ---------------------------------------------------------------------------------------- | --------------------------------------- |
+| ----------------------------------------- | ---------------------------------------------------------------------------------------- |-----------------------------------------|
 | `global.image.repository`                 | Image registry to use for all SDP images.                                                | `ghcr.io/appgate/sdp-k8s-injector`      |
 | `global.image.tag`                        | Image tag to use for all SDP images. If not set, it defaults to `.Chart.appVersion`.     | `""`                                    |
 | `global.image.pullPolicy`                 | Image pull policy to use for all SDP images.                                             | `IfNotPresent`                          |
 | `global.image.pullSecrets`                | Image pull secret to use for all SDP images.                                             | `[]`                                    |
 | `sdp.host`                                | Hostname of the SDP controller                                                           | `""`                                    |
 | `sdp.adminSecret`                         | Name of the secret for initial authentication                                            | `""`                                    |
-| `sdp.clientVersion`                       | Version of the SDP client to inject as sidecars.                                         | `6.2`                                   |
+| `sdp.clientVersion`                       | Version of the SDP client to inject as sidecars.                                         | `6.3`                                   |
 | `sdp.clusterID`                           | An identifier to prefix service users and client profiles                                | `""`                                    |
 | `sdp.metaClient.enabled`                  | Whether to set up an SDP client on the Identity Service                                  | `false`                                 |
 | `sdp.metaClient.adminSecret`              | Name of the secret for initial authentication                                            | `""`                                    |

docker/sdp-dnsmasq-Dockerfile

@@ -1,7 +1,7 @@
 ARG MAJOR_VERSION
 ARG MINOR_VERSION
 ARG REVISION
-FROM alpine:3.14.0
+FROM alpine:3.20
 
 LABEL sdp=true
 LABEL project=sdp-injector

docker/sdp-headless-driver-Dockerfile

@@ -4,7 +4,7 @@ ARG REVISION
 ARG CLIENT_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}"
 ARG CLIENT_DEB="appgate-sdp-headless_${CLIENT_FULL_VERSION}_amd64.deb"
 
-FROM alpine AS sdp-headless-client
+FROM alpine:3.20 AS sdp-headless-client
 ARG CLIENT_VERSION
 ARG CLIENT_DEB
 

docker/sdp-headless-service-Dockerfile

@@ -4,7 +4,7 @@ ARG REVISION
 ARG CLIENT_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}"
 ARG CLIENT_DEB="appgate-sdp-headless_amd64.deb"
 
-FROM alpine AS sdp-headless-client
+FROM alpine:3.20 AS sdp-headless-client
 ARG CLIENT_VERSION
 ARG CLIENT_DEB
 

docker/sdp-k8s-injector-Dockerfile

@@ -1,14 +1,14 @@
 ARG RUST_VERSION=1.78
 
-FROM rust:${RUST_VERSION}-slim-bullseye as chef
+FROM rust:${RUST_VERSION}-slim-bullseye AS chef
 LABEL sdp=true
 LABEL project=sdp-k8s-injector
 LABEL image=chef
 WORKDIR /sdp-build
 RUN cargo install cargo-chef
 
 ### planner next
-FROM chef as sdp-planner
+FROM chef AS sdp-planner
 LABEL sdp=true
 LABEL project=sdp-k8s-injector
 LABEL image=sdp-planner
@@ -17,7 +17,7 @@ COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 ### builder next
-FROM sdp-planner as sdp-cacher
+FROM sdp-planner AS sdp-cacher
 LABEL sdp=true
 LABEL project=sdp-k8s-injector
 LABEL image=sdp-cacher

k8s/chart/Chart.yaml

@@ -16,10 +16,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "1.3.0"
+version: "1.3.1"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.3.0"
+appVersion: "1.3.1"

k8s/chart/values.yaml

@@ -28,7 +28,7 @@ sdp:
   ## @param sdp.clusterID An identifier to prefix service users and client profiles
   host: ""
   adminSecret: ""
-  clientVersion: 6.2-1
+  clientVersion: 6.3-1
   clusterID: ""
 
   ## @param sdp.metaClient.enabled Whether to set up an SDP client on the Identity Service

k8s/crd/Chart.yaml

@@ -5,7 +5,7 @@ description: Helm chart for SDP Kubernetes Injector CRD
 type: application
 
 # Chart version should remain consistent with ../chart/Chart.yaml
-version: "1.3.0"
+version: "1.3.1"
 
 # Chart appVersion should be the same as ../chart/Chart.yaml
-appVersion: "1.3.0"
+appVersion: "1.3.1"

sdp-common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sdp-common"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

sdp-identity-service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sdp-identity-service"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

sdp-injector/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sdp-injector"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

sdp-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sdp-macros"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

sdp-test-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sdp-test-macros"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html