refactor(operator/inventory): deploy hw discovery from operator

Signed-off-by: Artur Troian <[email protected]>

_docs/kustomize/akash-operator-inventory/cluster-roles.yaml

@@ -15,7 +15,6 @@ rules:
     resources:
       - namespaces
       - nodes
-      - pods
       - events
       - services
       - persistentvolumes
@@ -30,6 +29,16 @@ rules:
       - nodes
     verbs:
       - patch
+  - apiGroups:
+      - ''
+    resources:
+      - pods
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - watch
   - apiGroups:
       - ''
     resources:
@@ -40,6 +49,12 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - ''
+    resources:
+      - pods/proxy
+    verbs:
+      - get
   - apiGroups:
       - storage.k8s.io
     resources:
@@ -75,27 +90,15 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - ''
-    resources:
-      - configmaps
-    verbs:
-      - create
-      - update
-      - patch
-      - delete
-      - get
-      - list
-      - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: operator-inventory-node
+  name: operator-inventory-hardware-discovery
   labels:
     akash.network: "true"
     app.kubernetes.io/name: inventory
-    app.kubernetes.io/instance: inventory-node
+    app.kubernetes.io/instance: inventory-hardware-discovery
     app.kubernetes.io/component: operator
     app.kubernetes.io/part-of: provider
 rules:

_docs/kustomize/akash-operator-inventory/deployment.yaml

@@ -39,6 +39,14 @@ spec:
           env:
             - name: AP_CONFIG
               value: /akash/config.yaml
+            - name: AP_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: AP_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
           resources:
             limits:
               cpu: 500m

_docs/kustomize/akash-operator-inventory/kustomization.yaml

@@ -7,7 +7,6 @@ resources:
   - cluster-roles.yaml
   - role-bindings.yaml
   - service.yaml
-  - daemonset.yaml
   - deployment.yaml
 configMapGenerator:
   - name: operator-inventory

_docs/kustomize/akash-operator-inventory/role-bindings.yaml

@@ -21,20 +21,20 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: operator-inventory-node
+  name: operator-inventory-hardware-discovery
   labels:
     akash.network: "true"
     app.kubernetes.io/name: inventory
-    app.kubernetes.io/instance: inventory-node
+    app.kubernetes.io/instance: inventory-hardware-discovery
     app.kubernetes.io/component: operator
     app.kubernetes.io/part-of: provider
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: operator-inventory-node
+  name: operator-inventory-hardware-discovery
 subjects:
   - kind: ServiceAccount
-    name: operator-inventory-node
+    name: operator-inventory-hardware-discovery
     namespace: akash-services
 ---
 apiVersion: rbac.authorization.k8s.io/v1

_docs/kustomize/akash-operator-inventory/service-accounts.yaml

@@ -15,11 +15,11 @@ automountServiceAccountToken: true
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: operator-inventory-node
+  name: operator-inventory-hardware-discovery
   namespace: akash-services
   labels:
     akash.network: "true"
     app.kubernetes.io/name: inventory
-    app.kubernetes.io/instance: inventory-node
+    app.kubernetes.io/instance: inventory-hardware-discovery
     app.kubernetes.io/component: operator
     app.kubernetes.io/part-of: provider

_docs/kustomize/templates/akash-operator-inventory/kustomization.yaml

@@ -12,9 +12,3 @@ patches:
       group: apps
       name: operator-inventory
       version: v1
-  - path: docker-image.yaml
-    target:
-      kind: DaemonSet
-      group: apps
-      name: operator-inventory-node
-      version: v1

_run/common-kube.mk

@@ -147,7 +147,6 @@ kube-setup-ingress-calico:
 
 .PHONY: kube-setup-ingress-default
 kube-setup-ingress-default:
-	kubectl label nodes $(KIND_NAME)-control-plane akash.network/role=ingress
 	kubectl apply -f "$(INGRESS_CONFIG_PATH)"
 	kubectl rollout status deployment -n ingress-nginx ingress-nginx-controller --timeout=$(KUBE_ROLLOUT_TIMEOUT)s
 	kubectl apply -f "$(METALLB_CONFIG_PATH)"
@@ -163,8 +162,6 @@ kube-status-ingress-%:
 kube-deployment-rollout-operator-inventory:
 	kubectl -n akash-services rollout status daemonset operator-inventory-node --timeout=$(KUBE_ROLLOUT_TIMEOUT)s
 	kubectl -n akash-services wait pods -l app.kubernetes.io/part-of=provider -l app.kubernetes.io/component=operator -l app.kubernetes.io/instance=inventory-node --for condition=Ready --timeout=$(KUBE_ROLLOUT_TIMEOUT)s
-	kubectl -n akash-services rollout status deployment operator-inventory --timeout=$(KUBE_ROLLOUT_TIMEOUT)s
-	kubectl -n akash-services wait pods -l app.kubernetes.io/part-of=provider -l app.kubernetes.io/component=operator -l app.kubernetes.io/instance=inventory-service --for condition=Ready --timeout=$(KUBE_ROLLOUT_TIMEOUT)s
 
 .PHONY: kube-deployment-rollout-%
 kube-deployment-rollout-%:
@@ -192,13 +189,12 @@ akash-node-ready:
 	)
 
 
-.PHONY: kube-operator-inventory-logs
-kube-operator-inventory-logs:
+.PHONY: kube-logs-operator-inventory
+kube-logs-operator-inventory:
 	kubectl -n akash-services logs -f \
 		-l app.kubernetes.io/part-of=provider,app.kubernetes.io/component=operator,app.kubernetes.io/instance=inventory-service,app.kubernetes.io/name=inventory
 
-.PHONY: kube-operator-inventory-node-logs
-kube-operator-inventory-node-logs:
-	kubectl -n akash-services logs -f \
-		-l app.kubernetes.io/part-of=provider,app.kubernetes.io/component=operator,app.kubernetes.io/instance=inventory-node,app.kubernetes.io/name=inventory
-
+#.PHONY: kube-operator-inventory-node-logs
+#kube-operator-inventory-node-logs:
+#	kubectl -n akash-services logs -f \
+#		-l app.kubernetes.io/part-of=provider,app.kubernetes.io/component=operator,app.kubernetes.io/instance=inventory-node,app.kubernetes.io/name=inventory

_run/kind-config-calico.yaml

@@ -1,17 +1,18 @@
+---
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 networking:
   disableDefaultCNI: true
   #podSubnet: 192.168.0.0/16 # Default Calico subnet
 nodes:
-- role: control-plane
-  kubeadmConfigPatches:
-  - kind: InitConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        node-labels: "ingress-ready=true"
-  extraPortMappings:
-  - containerPort: 80
-    protocol: TCP
-  - containerPort: 443
-    protocol: TCP
+  - role: control-plane
+    kubeadmConfigPatches:
+      - kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"
+    extraPortMappings:
+      - containerPort: 80
+        protocol: TCP
+      - containerPort: 443
+        protocol: TCP

_run/kube/kind-config-80.yaml

@@ -1,14 +1,15 @@
+---
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
-- role: control-plane
-  kubeadmConfigPatches:
-  - |
-    kind: InitConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        node-labels: "ingress-ready=true"
-  extraPortMappings:
-  - containerPort: 80
-    hostPort: 80
-    protocol: TCP
+  - role: control-plane
+    kubeadmConfigPatches:
+      - |
+        kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"
+    extraPortMappings:
+      - containerPort: 80
+        hostPort: 80
+        protocol: TCP

_run/kube/kind-config.yaml

@@ -1,13 +1,14 @@
+---
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
-- role: control-plane
-  kubeadmConfigPatches:
-  - |
-    kind: InitConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        node-labels: "ingress-ready=true"
-  extraPortMappings:
-  - containerPort: 80
-    protocol: TCP
+  - role: control-plane
+    kubeadmConfigPatches:
+      - |
+        kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"
+    extraPortMappings:
+      - containerPort: 80
+        protocol: TCP

cluster/kube/builder/builder.go

@@ -25,6 +25,7 @@ const (
 	AkashNetworkStorageClasses    = "akash.network/storageclasses"
 	AkashServiceTarget            = "akash.network/service-target"
 	AkashServiceCapabilityGPU     = "akash.network/capabilities.gpu"
+	AkashServiceCapabilityStorage = "akash.network/capabilities.storage"
 	AkashMetalLB                  = "metal-lb"
 	akashDeploymentPolicyName     = "akash-deployment-restrictions"
 	akashNetworkNamespace         = "akash.network/namespace"