remove ccm (we dont need it), change values locations to new file str…

…ucture

Signed-off-by: Jeffrey Sica <me@jeefy.dev>

ci/cluster/equinix/README.md

@@ -7,18 +7,19 @@ ArgoCD will be used to deploy new external GitHub Action runners
 Using a `c2.medium.x86` for the Control Plane node.
 
 ```
-export API_IP=$(jq -r '.network.addresses | map(select(.public==true and .management==true)) | first | .address' /tmp/metadata.json)
-echo $API_IP
+apt update 
+apt upgrade -y
+apt install -y jq
+curl -fsSL https://metadata.platformequinix.com/metadata > /tmp/metadata.json
+export API_IPV4=$(jq -r '.network.addresses | map(select(.public==true and .management==true)) | first | .address' /tmp/metadata.json)
+export API_IPV6=$(jq -r '.network.addresses | map(select(.public==true and .management==true)) | nth(1) | .address' /tmp/metadata.json)
+echo "${API_IPV4},${API_IPV6}"
 export INSTALL_K3S_EXEC="\
-    --bind-address ${API_IP} \
-    --advertise-address ${API_IP} \
-    --node-ip ${API_IP} \
-    --tls-san ${API_IP} \
-    --no-deploy servicelb \
+    --bind-address "${API_IPV4}" \
+    --advertise-address "${API_IPV4}" \
+    --disable servicelb \
     --cluster-cidr=10.42.0.0/16,2001:cafe:42::/56 \
-    --service-cidr=10.43.0.0/16,2001:cafe:43::/112 \
-    --kubelet-arg cloud-provider=external \
-    --disable-cloud-controller"
+    --service-cidr=10.43.0.0/16,2001:cafe:43::/112"
 curl -sfL https://get.k3s.io | sh -
 ```
 
@@ -34,7 +35,6 @@ kubectl create ns arc-systems
 kubectl create ns argocd
 
 # Populate required secrets
-kubectl apply -f secrets/ccm-secret.yaml
 kubectl apply -f secrets/cluster-autoscaler-secret.yaml
 kubectl apply -f secrets/github-arc-secret.yaml
 
@@ -43,5 +43,11 @@ export ARGOCD_VERSION="v2.12.4"
 kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/$ARGOCD_VERSION/manifests/core-install.yaml
 
 # ArgoCD go brrrrrrr
-kubectl apply -n argocd -f cncf-automation.yaml
+kubectl apply -n argocd -f argo-automation.yaml
+```
+
+To tear it all down:
+
+```
+/usr/local/bin/k3s-uninstall.sh
 ```

ci/cluster/equinix/arc/argo.yaml

@@ -12,7 +12,7 @@ spec:
     helm:
       releaseName: cncf-gha-controller
       valueFiles:
-      - $values/resources/github-arc/equinix/values/github-runner-controller.yaml
+      - $values/ci/cluster/equinix/arc/values.yaml
   - repoURL: 'https://github.com/cncf/automation.git'
     targetRevision: main
     ref: values

ci/cluster/equinix/argo-automation.yaml

@@ -1,28 +1,5 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
-metadata:
-  name: ccm
-  namespace: argocd
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/equinix/cloud-provider-equinix-metal
-    path: deploy/chart/
-    targetRevision: v3.8.1
-    helm:
-      parameters:
-        - name: configSecret.create
-          value: 'false'
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: kube-system
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
 metadata:
   name: github-arc
   namespace: argocd