feat: add arm and manfiests to dist

Signed-off-by: vsoch <[email protected]>

Author: vsoch

.github/test.sh

@@ -3,8 +3,8 @@
 set -eEu -o pipefail
 
 # Show logs for the manager (need to do this while it exists)
-sleep 10
-manager=$(kubectl get pods  -l component=state-machine-manager -o json | jq -r .items[0].metadata.name)
+sleep 15
+manager=$(kubectl get pods -l control-plane=controller-manager -n state-machine-operator-system -o json | jq -r .items[0].metadata.name)
 echo "Manager pod is $manager"
 kubectl logs $manager
 

.github/workflows/e2e-test.yaml

@@ -27,13 +27,6 @@ jobs:
 
   test:
     needs: [build]
-    env:
-      registry: ghcr.io/converged-computing
-      namespace: state-machine-operator-system
-      controller_container: ghcr.io/flux-framework/fluxqueue
-      scheduler_container: ghcr.io/flux-framework/fluxqueue-scheduler
-      postgres_container: ghcr.io/flux-framework/fluxqueue-postgres
-
     runs-on: ubuntu-latest
     name: test state machine operator
     steps:

.github/workflows/test-flux.yaml

@@ -1,6 +1,7 @@
 name: test-flux
 on:
-  pull_request: []
+  pull_request:
+    types: [opened, reopened]
 
 jobs:
   build:

Makefile

@@ -146,6 +146,15 @@ docker-push: ## Push docker image with the manager.
 manager:
 	$(CONTAINER_TOOL) build -f docker/manager/Dockerfile -t ${MANAGER_IMG} .
 
+.PHONY: pre-push
+pre-push: generate api build-config-arm build-config helm
+	git status
+
+.PHONY: build-config-arm
+build-config-arm: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${ARMIMG}
+	$(KUSTOMIZE) build config/default > examples/dist/state-machine-operator-arm.yaml
+
 .PHONY: kind
 kind: manager ## Build docker image with the manager and load into kind
 	kind load docker-image ${MANAGER_IMG}

api/v1alpha1/zz_generated.deepcopy.go

@@ -49,4 +49,4 @@ spec:
       securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
         8 }}
       serviceAccountName: {{ include "chart.fullname" . }}-controller-manager
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10

chart/templates/deployment.yaml

@@ -50,4 +50,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'

chart/templates/leader-election-rbac.yaml

@@ -11,6 +11,10 @@ rules:
   - events
   verbs:
   - create
+  - delete
+  - get
+  - list
+  - patch
   - update
   - watch
 - apiGroups:
@@ -29,7 +33,7 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - rolebindings
+  - miniclusters
   verbs:
   - create
   - delete
@@ -41,7 +45,19 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - roles
+  - miniclusters/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - miniclusters/status
   verbs:
   - create
   - delete
@@ -126,6 +142,19 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - batch
+  resources:
+  - pods/log
+  verbs:
+  - create
+  - delete
+  - exec
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -188,6 +217,14 @@ rules:
   verbs:
   - create
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -296,6 +333,90 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - events.k8s.io
+  resources:
+  - events
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - flux-framework.org
+  resources:
+  - miniclusters
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - flux-framework.org
+  resources:
+  - miniclusters/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - flux-framework.org
+  resources:
+  - miniclusters/status
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - jobset.x-k8s.io
+  resources:
+  - jobsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - jobset.x-k8s.io
+  resources:
+  - jobsets/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - jobset.x-k8s.io
+  resources:
+  - jobsets/status
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - networking.k8s.io
   resources:
@@ -308,6 +429,30 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - clusterrolebindings
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - clusterroles
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - rbac.authorization.k8s.io
   resources:
@@ -372,4 +517,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'

chart/templates/manager-rbac.yaml

@@ -31,4 +31,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'

chart/templates/metrics-auth-rbac.yaml

@@ -8,4 +8,4 @@ rules:
 - nonResourceURLs:
   - /metrics
   verbs:
-  - get
+  - get