fix: build and patch !

Author: batleforc

.github/workflows/release-prepare.yml

@@ -170,7 +170,7 @@ jobs:
       - name: ⎈ Package and push Helm Chart
         run: |
           helm package deploy/chart-crd
-          helm push chart-crd-*.tgz oci://${{ env.REGISTRY }}/${{ env.REPO_NAME_LOWER }}/charts-crd --version ${{ needs.gather-facts.outputs.version }}
+          helm push chart-crd-*.tgz oci://${{ env.REGISTRY }}/${{ env.REPO_NAME_LOWER }}/charts-crd
   build-and-push-helm:
     name: ⎈ Build and push helm chart
     needs: gather-facts
@@ -196,7 +196,7 @@ jobs:
       - name: ⎈ Package and push Helm Chart
         run: |
           helm package deploy/chart
-          helm push chart-*.tgz oci://${{ env.REGISTRY }}/${{ env.REPO_NAME_LOWER }}/charts --version ${{ needs.gather-facts.outputs.version }}
+          helm push chart-*.tgz oci://${{ env.REGISTRY }}/${{ env.REPO_NAME_LOWER }}/charts
 
   create-draft-release:
     permissions:

cog.toml

@@ -62,3 +62,6 @@ proxyauthK8S-cli = { path = 'libs/cli/cli', bump_order = 1, public_api = true }
 
 proxyauthK8S-front = { path = 'apps/front', bump_order = 1, public_api = true }
 proxyauthK8S-front-api = { path = 'libs/front/front-api', bump_order = 1, public_api = true }
+
+proxyauthK8S-helm = { path = 'deploy/chart', bump_order = 1, public_api = true }
+proxyauthK8S-helm-crd = { path = 'deploy/chart-crd', bump_order = 1, public_api = true }

deploy/build/back/Containerfile

@@ -5,38 +5,46 @@ RUN apk add --no-cache clang lld musl-dev git openssl-dev libcrypto3 perl
 
 
 # Prepare the build environment and cache dependencies
-RUN mkdir -p libs/api/src && \
-  mkdir -p libs/common/src && \
-  mkdir -p libs/crd/src && \
-  mkdir -p libs/trace/src && \
-  mkdir -p libs/controller/src && \
-  mkdir -p libs/client_api/src && \
+RUN mkdir -p libs/server/api/src && \
+  mkdir -p libs/server/common/src && \
+  mkdir -p libs/server/crd/src && \
+  mkdir -p libs/server/trace/src && \
+  mkdir -p libs/server/controller/src && \
+  mkdir -p libs/cli/client_api/src && \
+  mkdir -p libs/cli/cli/src && \
+  mkdir -p libs/cli/cli_trace/src && \
   mkdir -p apps/server/src && \
   mkdir -p apps/crdgen/src && \
   mkdir -p apps/swaggergen/src && \
   mkdir -p apps/kubectl_proxyauth/src
 
 # Copy Cargo.toml files
 COPY Cargo.toml .
-COPY libs/api/Cargo.toml libs/api/Cargo.toml
-COPY libs/common/Cargo.toml libs/common/Cargo.toml
-COPY libs/crd/Cargo.toml libs/crd/Cargo.toml
-COPY libs/trace/Cargo.toml libs/trace/Cargo.toml
-COPY libs/controller/Cargo.toml libs/controller/Cargo.toml
-COPY libs/client_api/Cargo.toml libs/client_api/Cargo.toml
+COPY libs/server/api/Cargo.toml libs/server/api/Cargo.toml
+COPY libs/server/common/Cargo.toml libs/server/common/Cargo.toml
+COPY libs/server/crd/Cargo.toml libs/server/crd/Cargo.toml
+COPY libs/server/trace/Cargo.toml libs/server/trace/Cargo.toml
+COPY libs/server/controller/Cargo.toml libs/server/controller/Cargo.toml
+
+COPY libs/cli/client_api/Cargo.toml libs/cli/client_api/Cargo.toml
+COPY libs/cli/cli/Cargo.toml libs/cli/cli/Cargo.toml
+COPY libs/cli/cli_trace/Cargo.toml libs/cli/cli_trace/Cargo.toml
+
 COPY apps/server/Cargo.toml apps/server/Cargo.toml
 COPY apps/crdgen/Cargo.toml apps/crdgen/Cargo.toml
 COPY apps/swaggergen/Cargo.toml apps/swaggergen/Cargo.toml
 COPY apps/kubectl_proxyauth/Cargo.toml apps/kubectl_proxyauth/Cargo.toml
 COPY .cargo .
 
 # Create dummy file.rs files to allow cargo to make cache
-RUN echo "fn main() {}" > libs/api/src/lib.rs && \
-  echo "fn main() {}" > libs/common/src/lib.rs && \
-  echo "fn main() {}" > libs/crd/src/lib.rs && \
-  echo "fn main() {}" > libs/trace/src/lib.rs && \
-  echo "fn main() {}" > libs/controller/src/lib.rs && \
-  echo "fn main() {}" > libs/client_api/src/lib.rs && \
+RUN echo "fn main() {}" > libs/server/api/src/lib.rs && \
+  echo "fn main() {}" > libs/server/common/src/lib.rs && \
+  echo "fn main() {}" > libs/server/crd/src/lib.rs && \
+  echo "fn main() {}" > libs/server/trace/src/lib.rs && \
+  echo "fn main() {}" > libs/server/controller/src/lib.rs && \
+  echo "fn main() {}" > libs/cli/client_api/src/lib.rs && \
+  echo "fn main() {}" > libs/cli/cli/src/lib.rs && \
+  echo "fn main() {}" > libs/cli/cli_trace/src/lib.rs && \
   echo "fn main() {}" > apps/server/src/main.rs && \
   echo "fn main() {}" > apps/crdgen/src/main.rs && \
   echo "fn main() {}" > apps/swaggergen/src/main.rs && \
@@ -73,7 +81,7 @@ COPY --from=build_back /app/dist/target/release/kubectl_proxyauth /app/kubectl-p
 
 EXPOSE 5437
 
-ENV SERVER_PORT 5437
-ENV ENV production
+ENV SERVER_PORT=5437
+ENV ENV=production
 
 CMD ["/app/server"]

deploy/build/front/Containerfile

@@ -1,11 +1,10 @@
 FROM registry.hub.docker.com/library/node:24 AS build
 WORKDIR /app
-ENV ENV production
+ENV ENV=production
 COPY package.json ./
 COPY yarn.lock ./
 RUN yarn
 COPY . ./
-ENV ENV production
 RUN npx nx build front
 
 FROM registry.hub.docker.com/nginxinc/nginx-unprivileged:1-alpine-slim AS deploy