Setup build

.cargo/config.toml

@@ -1,2 +0,0 @@
-[env]
-RUSTC_BOOTSTRAP = "1"

.dockerignore

@@ -1,4 +1,3 @@
 *
 !src
 !Cargo.*
-!.cargo/config.toml

.gitea/workflows/build.yaml

@@ -7,10 +7,89 @@ on:
     tags:
       - v*.*.*
 
+env:
+  OCI_REPO: git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name}}
+
 jobs:
   build:
-    uses: dreaded_x/workflows/.gitea/workflows/rust-kubernetes.yaml@66ab50c3ac239dbdd1e42e6276ec2e65b6a79379
+    name: Build container and manifests
-    secrets: inherit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-      generate_crds: true
+          fetch-depth: 0
-      webhook_url: ${{ secrets.WEBHOOK_URL }}
+          fetch-tags: true
+
+      # TODO: Actually set an env variable and use it in the application
+      - name: Set version string
+        run: |
+          git describe --always --dirty="-modified"
+
+      - name: Get Git commit timestamps
+        run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
+
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.huizinga.dev
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install kustomize
+        run: |
+          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
+
+      - name: Setup Flux CLI
+        uses: https://github.com/fluxcd/flux2/action@main
+        with:
+          version: v2.5.0
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.OCI_REPO }}
+          tags: |
+            type=edge
+            type=ref,event=branch
+            type=semver,pattern=v{{version}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}
+
+      - name: Build container
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          sbom: true
+          provenance: mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          annotations: ${{ steps.meta.outputs.annotations }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+        env:
+          SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
+
+      - name: Generate CRDs
+        run: |
+          docker run --rm ${{ env.OCI_REPO }}@${{ steps.build.outputs.imageid }} /crdgen > ./manifests/crds.yaml
+
+      - name: Kustomize manifests
+        run: |
+          ./kustomize build ./manifests | sed "s/\${DIGEST}/${{ steps.build.outputs.digest }}/" > ./manifests.yaml
+
+      - name: Push manifests
+        run: |
+          flux push artifact oci://${{ env.OCI_REPO }}/manifests:${{ gitea.head_ref || gitea.ref_name }} \
+            --path="./manifests.yaml" \
+            --source="$(git config --get remote.origin.url)" \
+            --revision="$(git rev-parse HEAD)" \
+            $(echo "${{ steps.meta.outputs.labels }}" | sed -e 's/^/-a /')
+
+          flux tag artifact oci://${{ env.OCI_REPO }}/manifests:${{ gitea.head_ref || gitea.ref_name }} \
+            $(echo "${{ steps.meta.outputs.tags }}" | sed -e 's/^.*:/--tag /')

.pre-commit-config.yaml

@@ -54,7 +54,7 @@ repos:
       - id: udeps
         name: unused
         description: Check for unused crates
-        entry: cargo +nightly udeps
+        entry: cargo udeps
         args: ["--workspace"]
         language: system
         types: [file]

Cargo.lock

@@ -97,7 +97,6 @@ dependencies = [
  "color-eyre",
  "dotenvy",
  "futures-util",
- "git-version",
  "k8s-openapi",
  "kube",
  "schemars",
@@ -556,26 +555,6 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
-[[package]]
-name = "git-version"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19"
-dependencies = [
- "git-version-macro",
-]
-
-[[package]]
-name = "git-version-macro"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"

Cargo.toml

@@ -8,7 +8,6 @@ default-run = "authelia-controller"
 color-eyre = "0.6.3"
 dotenvy = "0.15.7"
 futures-util = "0.3.31"
-git-version = "0.3.9"
 k8s-openapi = { version = "0.24.0", features = ["v1_31"] }
 kube = { version = "0.99.0", features = ["derive", "runtime"] }
 schemars = "0.8.22"

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.86 AS base
+FROM rust:1.85 AS base
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN cargo install cargo-chef --locked --version 0.1.71 && \
     cargo install cargo-auditable --locked --version 0.6.6
@@ -13,8 +13,7 @@ COPY --from=planner /app/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 
 COPY . .
-ARG RELEASE_VERSION
+ENV RUSTC_BOOTSTRAP=1
-ENV RELEASE_VERSION=${RELEASE_VERSION}
 RUN cargo auditable build --release
 
 FROM gcr.io/distroless/cc-debian12:nonroot AS runtime

manifests/cluster-role.yaml

@@ -15,11 +15,6 @@ rules:
       - ""
     resources:
       - secrets
-    verbs:
-      - "*"
-  - apiGroups:
-      - "apps"
-    resources:
       - deployments
     verbs:
       - "*"

manifests/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: authelia
+namespace: lldap
 resources:
   - ./crds.yaml
   - ./service-account.yaml

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.86"
+channel = "1.85"
 profile = "default"
 components = ["rust-analyzer"]

src/lib.rs

@@ -1,6 +1,2 @@
-#![feature(let_chains)]
 pub mod context;
 pub mod resources;
-mod version;
-
-pub use version::VERSION;

src/main.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use authelia_controller::VERSION;
 use authelia_controller::context::Context;
 use authelia_controller::resources::AccessControlRule;
 use color_eyre::eyre::Context as _;
@@ -40,7 +39,7 @@ async fn main() -> color_eyre::Result<()> {
         })
         .unwrap_or(Ok(15))?;
 
-    info!(version = VERSION, "Starting");
+    info!("Starting");
 
     let client = Client::try_default().await?;
     let access_control_rules = Api::<AccessControlRule>::all(client.clone());

src/resources/access_control_rule.rs

@@ -29,17 +29,12 @@ enum AccessPolicy {
 )]
 #[kube(
     shortname = "acl",
-    doc = "Custom resource for managing authelia access rules",
+    doc = "Custom resource for managing authelia access rules"
-    printcolumn = r#"{"name":"Domain", "type":"string", "jsonPath":".spec.domain"}"#,
-    printcolumn = r#"{"name":"Policy", "type":"string", "jsonPath":".spec.policy"}"#,
-    printcolumn = r#"{"name":"Subject", "type":"string", "jsonPath":".spec.subject"}"#,
-    printcolumn = r#"{"name":"Age", "type":"date", "jsonPath":".metadata.creationTimestamp"}"#
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AccessControlRuleSpec {
     domain: String,
     policy: AccessPolicy,
-    subject: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, Hash)]
@@ -77,7 +72,6 @@ impl AccessControlRule {
 
         let secret = Secret {
             metadata: ObjectMeta {
-                name: Some(ctx.secret_name.clone()),
                 ..Default::default()
             },
             string_data: Some(contents),

src/version.rs

@@ -1,11 +0,0 @@
-pub const VERSION: &str = get_version();
-
-const fn get_version() -> &'static str {
-    if let Some(version) = std::option_env!("RELEASE_VERSION")
-        && !version.is_empty()
-    {
-        version
-    } else {
-        git_version::git_version!(fallback = "unknown")
-    }
-}

yaml/rule-test-2.yaml

@@ -5,4 +5,3 @@ metadata:
 spec:
   domain: "test-2.domain"
   policy: one_factor
-  subject: group:lldap_admin