Merge chrony and chrony-client charm

.github/workflows/docs.yaml

@@ -12,6 +12,6 @@ jobs:
       contents: read
     secrets: inherit
     with:
-      vale-files: '["README.md","CONTRIBUTING.md","chrony-client-operator/docs/","chrony-operator/docs"]'
+      vale-files: '["README.md","CONTRIBUTING.md","docs/"]'
       linkcheck-fail-on-error: false
 

.github/workflows/tests.yaml

@@ -5,14 +5,7 @@ on:
   pull_request:
 jobs:
   unit-tests:
-    strategy:
-      matrix:
-        charm:
-          - name: chrony
-            working-directory: ./chrony-operator
-          - name: chrony-client
-            working-directory: ./chrony-client-operator
-    name: Unit tests for ${{ matrix.charm.name }}
+    name: Unit tests
     uses: canonical/operator-workflows/.github/workflows/test.yaml@main
     permissions:
       contents: read
@@ -22,7 +15,7 @@ jobs:
       runs-on-base: ubuntu-24.04
       python-version: "3.12"
       self-hosted-runner: false
-      working-directory: ${{ matrix.charm.working-directory }}
+      working-directory: ./
       with-uv: true
   integration-test:
     uses: canonical/charm-ci/.github/workflows/integration-test.yml@v0.0.1-alpha.9

artifacts.yaml

@@ -5,13 +5,13 @@ version: 1
 rocks: []
 charms:
 - name: chrony
-  charmcraft-yaml: chrony-operator/charmcraft.yaml
+  charmcraft-yaml: chrony-charmcraft.yaml
   resources: {}
   platforms:
   - arch: amd64
   channel: latest/edge
 - name: chrony-client
-  charmcraft-yaml: chrony-client-operator/charmcraft.yaml
+  charmcraft-yaml: chrony-client-charmcraft.yaml
   resources: {}
   platforms:
   - arch: amd64

chrony-operator/charmcraft.yaml → chrony-charmcraft.yaml

@@ -79,5 +79,29 @@ parts:
     plugin: uv
     build-snaps:
     - astral-uv
+    override-build: |
+      craftctl default
+      ln -sf chrony_charm.py "${CRAFT_PART_INSTALL}/src/charm.py"
+  files:
+    source: .
+    plugin: dump
+    stage:
+      - files
+  patches:
+    source: ./patches
+    plugin: nil
+  chrony-exporter:
+    after: [ patches ]
+    source: https://github.com/SuperQ/chrony_exporter.git
+    source-type: git
+    source-tag: v0.13.3
+    plugin: go
+    build-environment:
+      - CGO_ENABLED: "0"
+    build-snaps:
+      - go
+    override-build: |
+      git apply "$CRAFT_PROJECT_DIR/patches/exporter-reverse-lookup-timeout.patch"
+      craftctl default
 assumes:
   - juju >= 3.3

chrony-client-operator/charmcraft.yaml → chrony-client-charmcraft.yaml

@@ -61,6 +61,9 @@ parts:
     plugin: uv
     build-snaps:
       - astral-uv
+    override-build: |
+      craftctl default
+      ln -sf chrony_client_charm.py "${CRAFT_PART_INSTALL}/src/charm.py"
   files:
     source: .
     plugin: dump