remove affinity (artifact from copy over), fix yaml parse error in 32c

Signed-off-by: Jeffrey Sica <[email protected]>

Author: jeefy

ci/cluster/equinix/arc/argo.yaml

@@ -8,14 +8,9 @@ spec:
   sources:
   - chart: gha-runner-scale-set-controller
     repoURL: ghcr.io/actions/actions-runner-controller-charts
-    targetRevision: 0.9.3
+    targetRevision: 0.9.2
     helm:
       releaseName: cncf-gha-controller
-      valueFiles:
-      - $values/ci/cluster/equinix/arc/values.yaml
-  - repoURL: 'https://github.com/cncf/automation.git'
-    targetRevision: main
-    ref: values
   destination:
     server: "https://kubernetes.default.svc"
     namespace: arc-systems

ci/cluster/equinix/arc/values.yaml

@@ -3,6 +3,8 @@ kind: Application
 metadata:
   name: github-arc
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   syncPolicy:
     automated:
@@ -22,6 +24,8 @@ kind: Application
 metadata:
   name: equinix-autoscaler
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   syncPolicy:
     automated:
@@ -41,6 +45,8 @@ kind: Application
 metadata:
   name: github-runners
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "3"
 spec:
   syncPolicy:
     automated:

ci/cluster/equinix/argo-automation.yaml

@@ -6,9 +6,9 @@ metadata:
 spec:
   project: default
   sources:
-  - chart: gha-runner-scale-set-controller
+  - chart: gha-runner-scale-set
     repoURL: ghcr.io/actions/actions-runner-controller-charts
-    targetRevision: 0.9.3
+    targetRevision: 0.9.2
     helm:
       releaseName: equinix-16cpu-64gb
       valueFiles:
@@ -18,7 +18,7 @@ spec:
     ref: values
   destination:
     server: "https://kubernetes.default.svc"
-    namespace: equinix-16cpu-64gb
+    namespace: arc-systems
   syncPolicy:
     automated:
       prune: true

ci/cluster/equinix/runners/16cpu-64gb/argo.yaml

@@ -1,3 +1,14 @@
+## githubConfigUrl is the GitHub url for where you want to configure runners
+## ex: https://github.com/myorg/myrepo or https://github.com/myorg
+githubConfigUrl: https://github.com/enterprises/cncf
+
+## githubConfigSecret is the k8s secrets to use when auth with GitHub API.
+## You can choose to use GitHub App or a PAT token
+githubConfigSecret: github-arc-secret
+
+controllerServiceAccount:
+  namespace: arc-systems
+  name: cncf-gha-controller-gha-rs-controller
 ## proxy can be used to define proxy settings that will be used by the
 ## controller, the listener and the runner of this scale set.
 #
@@ -81,6 +92,10 @@ listenerTemplate:
             - matchExpressions:
                 - key: node-role.kubernetes.io/control-plane
                   operator: Exists
+    containers:
+      - name: listener
+        securityContext:
+          runAsUser: 1000
 #     containers:
 #     # Use this section to append additional configuration to the listener container.
 #     # If you change the name of the container, the configuration will not be applied to the listener,
@@ -177,15 +192,6 @@ template:
   ##                 requests:
   ##                   storage: 1Gi
   spec:
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: node.kubernetes.io/instance-type
-              operator: In
-              values:
-              - c3.medium.x86
     containers:
       - name: runner
         image: ghcr.io/jeefy/gha-runner:main

ci/cluster/equinix/runners/16cpu-64gb/values.yaml

@@ -6,9 +6,9 @@ metadata:
 spec:
   project: default
   sources:
-  - chart: gha-runner-scale-set-controller
+  - chart: gha-runner-scale-set
     repoURL: ghcr.io/actions/actions-runner-controller-charts
-    targetRevision: 0.9.3
+    targetRevision: 0.9.2
     helm:
       releaseName: equinix-2cpu-8gb
       valueFiles:
@@ -18,7 +18,7 @@ spec:
     ref: values
   destination:
     server: "https://kubernetes.default.svc"
-    namespace: equinix-2cpu-8gb
+    namespace: arc-systems
   syncPolicy:
     automated:
       prune: true

ci/cluster/equinix/runners/2cpu-8gb/argo.yaml

@@ -1,3 +1,14 @@
+## githubConfigUrl is the GitHub url for where you want to configure runners
+## ex: https://github.com/myorg/myrepo or https://github.com/myorg
+githubConfigUrl: https://github.com/enterprises/cncf
+
+## githubConfigSecret is the k8s secrets to use when auth with GitHub API.
+## You can choose to use GitHub App or a PAT token
+githubConfigSecret: github-arc-secret
+
+controllerServiceAccount:
+  namespace: arc-systems
+  name: cncf-gha-controller-gha-rs-controller
 ## proxy can be used to define proxy settings that will be used by the
 ## controller, the listener and the runner of this scale set.
 #
@@ -81,6 +92,10 @@ listenerTemplate:
             - matchExpressions:
                 - key: node-role.kubernetes.io/control-plane
                   operator: Exists
+    containers:
+      - name: listener
+        securityContext:
+          runAsUser: 1000
 #     containers:
 #     # Use this section to append additional configuration to the listener container.
 #     # If you change the name of the container, the configuration will not be applied to the listener,
@@ -176,16 +191,7 @@ template:
   ##               resources:
   ##                 requests:
   ##                   storage: 1Gi
-  spec:
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: node.kubernetes.io/instance-type
-              operator: In
-              values:
-              - c3.small.x86  
+  spec:  
     containers:
       - name: runner
         image: ghcr.io/jeefy/gha-runner:main

ci/cluster/equinix/runners/2cpu-8gb/values.yaml

@@ -6,9 +6,9 @@ metadata:
 spec:
   project: default
   sources:
-  - chart: gha-runner-scale-set-controller
+  - chart: gha-runner-scale-set
     repoURL: ghcr.io/actions/actions-runner-controller-charts
-    targetRevision: 0.9.3
+    targetRevision: 0.9.2
     helm:
       releaseName: equinix-32cpu-256gb
       valueFiles:
@@ -18,7 +18,7 @@ spec:
     ref: values
   destination:
     server: "https://kubernetes.default.svc"
-    namespace: equinix-32cpu-256gb
+    namespace: arc-systems
   syncPolicy:
     automated:
       prune: true

ci/cluster/equinix/runners/32cpu-256gb/argo.yaml

@@ -1,3 +1,14 @@
+## githubConfigUrl is the GitHub url for where you want to configure runners
+## ex: https://github.com/myorg/myrepo or https://github.com/myorg
+githubConfigUrl: https://github.com/enterprises/cncf
+
+## githubConfigSecret is the k8s secrets to use when auth with GitHub API.
+## You can choose to use GitHub App or a PAT token
+githubConfigSecret: github-arc-secret
+
+controllerServiceAccount:
+  namespace: arc-systems
+  name: cncf-gha-controller-gha-rs-controller
 ## proxy can be used to define proxy settings that will be used by the
 ## controller, the listener and the runner of this scale set.
 #
@@ -13,7 +24,7 @@
 #     - example.org
 
 ## maxRunners is the max number of runners the autoscaling runner set will scale up to.
-maxRunners: 10
+maxRunners: 20
 
 ## minRunners is the min number of idle runners. The target number of runners created will be
 ## calculated as a sum of minRunners and the number of jobs assigned to the scale set.
@@ -80,7 +91,12 @@ listenerTemplate:
           nodeSelectorTerms:
             - matchExpressions:
                 - key: node-role.kubernetes.io/control-plane
-                  operator: Exists#     containers:
+                  operator: Exists
+    containers:
+      - name: listener
+        securityContext:
+          runAsUser: 1000
+#     containers:
 #     # Use this section to append additional configuration to the listener container.
 #     # If you change the name of the container, the configuration will not be applied to the listener,
 #     # and it will be treated as a side-car container.
@@ -176,16 +192,7 @@ template:
   ##                 requests:
   ##                   storage: 1Gi
   spec:
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: node.kubernetes.io/instance-type
-              operator: In
-              values:
-              - m3.large.x86
-    containers:    
+    containers:
       - name: runner
         image: ghcr.io/jeefy/gha-runner:main
         imagePullPolicy: Always

ci/cluster/equinix/runners/32cpu-256gb/values.yaml

@@ -6,9 +6,9 @@ metadata:
 spec:
   project: default
   sources:
-  - chart: gha-runner-scale-set-controller
+  - chart: gha-runner-scale-set
     repoURL: ghcr.io/actions/actions-runner-controller-charts
-    targetRevision: 0.9.3
+    targetRevision: 0.9.2
     helm:
       releaseName: equinix-4cpu-16gb
       valueFiles:
@@ -18,7 +18,7 @@ spec:
     ref: values
   destination:
     server: "https://kubernetes.default.svc"
-    namespace: equinix-4cpu-16gb
+    namespace: arc-systems
   syncPolicy:
     automated:
       prune: true