refactor: actions-runner-controller namespace (#8647)

onedr0p · Jan 13, 2025 · e09fe04 · e09fe04
1 parent c45efd1
commit e09fe04
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 71 deletions.
diff --git a/...le-set-controller/app/externalsecret.yaml → ...runner-controller/app/externalsecret.yaml b/...le-set-controller/app/externalsecret.yaml → ...runner-controller/app/externalsecret.yaml
@@ -3,13 +3,13 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: actions-runner-controller-auth
+  name: actions-runner-controller
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: onepassword-connect
   target:
-    name: actions-runner-controller-auth-secret
+    name: actions-runner-controller-secret
     template:
       engineVersion: v2
       data:

diff --git a/...scale-set-controller/app/helmrelease.yaml → ...ns-runner-controller/app/helmrelease.yaml b/...scale-set-controller/app/helmrelease.yaml → ...ns-runner-controller/app/helmrelease.yaml
@@ -3,7 +3,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
-  name: gha-runner-scale-set-controller
+  name: &name actions-runner-controller
 spec:
   interval: 30m
   chart:
@@ -14,8 +14,6 @@ spec:
         kind: HelmRepository
         name: actions-runner-controller
         namespace: flux-system
-  driftDetection:
-    mode: enabled
   install:
     crds: CreateReplace
     remediation:
@@ -27,5 +25,5 @@ spec:
       strategy: rollback
       retries: 3
   values:
-    fullnameOverride: gha-runner-scale-set-controller
+    fullnameOverride: *name
     replicaCount: 1
diff --git a/...ale-set-controller/app/kustomization.yaml → ...-runner-controller/app/kustomization.yaml b/...ale-set-controller/app/kustomization.yaml → ...-runner-controller/app/kustomization.yaml
diff --git a/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml b/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml
@@ -0,0 +1,42 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app actions-runner-controller
+  namespace: flux-system
+spec:
+  targetNamespace: actions-runner-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  dependsOn:
+    - name: external-secrets-stores
+  path: ./kubernetes/apps/actions-runner-system/actions-runner-controller/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  wait: false
+  interval: 30m
+  timeout: 5m
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app actions-runner-controller-runners
+  namespace: flux-system
+spec:
+  targetNamespace: actions-runner-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  path: ./kubernetes/apps/actions-runner-system/actions-runner-controller/runners
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  wait: false
+  interval: 30m
+  timeout: 5m
diff --git a/...gha-runner-scale-set/app/helmrelease.yaml → ...troller/runners/home-ops/helmrelease.yaml b/...gha-runner-scale-set/app/helmrelease.yaml → ...troller/runners/home-ops/helmrelease.yaml
@@ -3,7 +3,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
-  name: gha-runner-scale-set
+  name: &name home-ops-runner
 spec:
   interval: 30m
   chart:
@@ -14,8 +14,6 @@ spec:
         kind: HelmRepository
         name: actions-runner-controller
         namespace: flux-system
-  driftDetection:
-    mode: enabled
   install:
     remediation:
       retries: 3
@@ -25,26 +23,26 @@ spec:
       strategy: rollback
       retries: 3
   dependsOn:
-    - name: gha-runner-scale-set-controller
+    - name: actions-runner-controller
       namespace: actions-runner-system
     - name: openebs
       namespace: openebs-system
   valuesFrom:
     - targetPath: githubConfigSecret.github_app_id
       kind: Secret
-      name: actions-runner-controller-auth-secret
+      name: actions-runner-controller-secret
       valuesKey: ACTION_RUNNER_CONTROLLER_GITHUB_APP_ID
     - targetPath: githubConfigSecret.github_app_installation_id
       kind: Secret
-      name: actions-runner-controller-auth-secret
+      name: actions-runner-controller-secret
       valuesKey: ACTION_RUNNER_CONTROLLER_GITHUB_INSTALLATION_ID
     - targetPath: githubConfigSecret.github_app_private_key
       kind: Secret
-      name: actions-runner-controller-auth-secret
+      name: actions-runner-controller-secret
       valuesKey: ACTION_RUNNER_CONTROLLER_GITHUB_PRIVATE_KEY
   values:
-    nameOverride: gha-runner-scale-set
-    runnerScaleSetName: gha-runner-scale-set
+    nameOverride: *name
+    runnerScaleSetName: *name
     githubConfigUrl: https://github.com/onedr0p/home-ops
     minRunners: 1
     maxRunners: 3
@@ -56,6 +54,9 @@ spec:
         resources:
           requests:
             storage: 25Gi
+    controllerServiceAccount:
+      name: actions-runner-controller
+      namespace: actions-runner-system
     template:
       spec:
         containers:
@@ -73,11 +74,8 @@ spec:
               - mountPath: /var/run/secrets/talos.dev
                 name: talos
                 readOnly: true
-        serviceAccountName: actions-runner
+        serviceAccountName: *name
         volumes:
           - name: talos
             secret:
-              secretName: actions-runner
-    controllerServiceAccount:
-      name: gha-runner-scale-set-controller
-      namespace: actions-runner-system
+              secretName: *name
diff --git a/...a-runner-scale-set/app/kustomization.yaml → ...oller/runners/home-ops/kustomization.yaml b/...a-runner-scale-set/app/kustomization.yaml → ...oller/runners/home-ops/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./rbac.yaml
   - ./helmrelease.yaml
+  - ./rbac.yaml
diff --git a/...system/gha-runner-scale-set/app/rbac.yaml → ...ner-controller/runners/home-ops/rbac.yaml b/...system/gha-runner-scale-set/app/rbac.yaml → ...ner-controller/runners/home-ops/rbac.yaml
@@ -2,25 +2,24 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: actions-runner
+  name: home-ops-runner
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: actions-runner
+  name: home-ops-runner
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: cluster-admin
 subjects:
   - kind: ServiceAccount
-    name: actions-runner
+    name: home-ops-runner
     namespace: actions-runner-system
 ---
 apiVersion: talos.dev/v1alpha1
 kind: ServiceAccount
 metadata:
-  name: actions-runner
+  name: home-ops-runner
 spec:
-  roles:
-    - os:admin
+  roles: ["os:admin"]
diff --git a/kubernetes/apps/actions-runner-system/actions-runner-controller/runners/kustomization.yaml b/kubernetes/apps/actions-runner-system/actions-runner-controller/runners/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./home-ops
diff --git a/kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml
diff --git a/kubernetes/apps/actions-runner-system/gha-runner-scale-set/ks.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set/ks.yaml
diff --git a/kubernetes/apps/actions-runner-system/kustomization.yaml b/kubernetes/apps/actions-runner-system/kustomization.yaml
@@ -7,8 +7,7 @@ resources:
   - ./namespace.yaml
   - ../../templates/alerts
   # Flux-Kustomizations
-  - ./gha-runner-scale-set-controller/ks.yaml
-  - ./gha-runner-scale-set/ks.yaml
+  - ./actions-runner-controller/ks.yaml
 transformers:
   - |-
     apiVersion: builtin