Merge pull request #8 from cdsl-research/future/v2

Apply patches to v2

Author: tomoyk

.github/workflows/image-build.yml

@@ -1,3 +1,5 @@
+name: Image Build
+
 on:
   push:
     branches:

README.md

@@ -45,6 +45,7 @@ Environment Variables:
 
 | Name                           | Default Value | Type    | Description | Component |
 | ---                            | ---           | ---     | ---         | ---       |
+| HOSTS_PATH                     | `$PROJECT_ROOT/hosts.yml` | String |  | crawler, dashboard, executor |
 | MONGO_USERNAME                 |               | String  | If this value is empty, ECoMan connects to MongoDB without authentication. | crawler, dashboard |
 | MONGO_PASSWORD                 |               | String  |             | crawler, dashboard |
 | MONGO_DBNAME                   | ecoman        | String  |             | crawler, dashboard |
@@ -64,4 +65,4 @@ ECoMan has following system archtiecture.
 - `dashboard` provides Web UI to Administrators. When Administrator accesses `dashboard`, it fetches VMs info from MongoDB and returns to Administrator.
 - `executor` receives actions, "Create VM" or "Update VM's power", from `dashboard` and does the actions via SSH.
 
-<img src="assets/architecture.png">
+<img src="assets/architecture.png">

docs/install_kubernetes.md

@@ -14,13 +14,13 @@ kubectl config set-context --current --namespace=ecoman
 Create a secret
 
 ```
-kubectl create secret generic ecoman-ssh-keyfile --from-file=ssh/id_rsa
+kubectl create secret generic priv-key --from-file=ssh/id_rsa
 ```
 
 (3) Create a ConfigMap for hosts.yml
 
 ```
-kubectl create configmap ecoman-hosts-yml --from-file=hosts.yml
+kubectl create configmap hosts-config --from-file=hosts.example.yml
 ```
 
 (4) Apply manifests

kubernetes/crawler.yml

@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: crawler
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      ecoman: crawler
+  template:
+    metadata:
+      labels:
+        ecoman: crawler
+    spec:
+      containers:
+        - name: crawler-container
+          image: cdsl-research/ecoman/crawler:v2.0.0
+          volumeMounts:
+            - name: privkey-volume
+              mountPath: /keys
+              readOnly: true
+            - name: hosts-config-volume
+              mountPath: /config
+              readOnly: true
+          env:
+            - name: MONGO_USER
+              value: mongo
+            - name: MONGO_PASSWORD
+              value: password
+            - name: MONGO_HOST
+              value: mongo-service
+            - name: HOSTS_PATH
+              value: /config/hosts.example.yaml
+      volumes:
+        - name: priv-key-volume
+          secret:
+            secretName: priv-key
+            items:
+              - key: id_rsa
+                path: id_rsa
+                mode: 0400
+        - name: hosts-config-volume
+          configMap:
+            name: hosts-config

kubernetes/dashboard.yml

@@ -0,0 +1,52 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dashboard
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      ecoman: dashboard
+  template:
+    metadata:
+      labels:
+        ecoman: dashboard
+    spec:
+      containers:
+        - name: dashboard-container
+          image: cdsl-research/ecoman/dashboard:v2.0.0
+          volumeMounts:
+            - name: hosts-config-volume
+              mountPath: /config
+              readOnly: true
+          ports:
+            - containerPort: 8000
+          env:
+            - name: MONGO_USER
+              value: mongo
+            - name: MONGO_PASSWORD
+              value: password
+            - name: MONGO_HOST
+              value: mongo-service
+            - name: EXECUTOR_ADDRESS
+              value: executor-service
+            - name: HOSTS_PATH
+              value: /config/hosts.example.yaml
+      volumes:
+        - name: hosts-config-volume
+          configMap:
+            name: hosts-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dashboard-svc
+spec:
+  type: NodePort
+  ports:
+    - name: "http-port"
+      protocol: "TCP"
+      port: 8000
+      targetPort: 8000
+  selector:
+    ecoman: dashboard

kubernetes/ecoman.yaml

@@ -0,0 +1,62 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: executor
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      ecoman: executor
+  template:
+    metadata:
+      labels:
+        ecoman: executor
+    spec:
+      containers:
+        - name: executor-container
+          image: cdsl-research/ecoman/executor:v2.0.0
+          volumeMounts:
+            - name: privkey-volume
+              mountPath: /keys
+              readOnly: true
+            - name: hosts-config-volume
+              mountPath: /config
+              readOnly: true
+          ports:
+            - containerPort: 8000
+          env:
+            - name: MONGO_USER
+              value: mongo
+            - name: MONGO_PASSWORD
+              value: password
+            - name: MONGO_HOST
+              value: mongo-service
+            - name: EXECUTOR_ADDRESS
+              value: executor-service
+            - name: HOSTS_PATH
+              value: /config/hosts.example.yaml
+      volumes:
+        - name: priv-key-volume
+          secret:
+            secretName: priv-key
+            items:
+              - key: id_rsa
+                path: id_rsa
+                mode: 0400
+        - name: hosts-config-volume
+          configMap:
+            name: hosts-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: executor-svc
+spec:
+  type: NodePort
+  ports:
+    - name: "http-port"
+      protocol: "TCP"
+      port: 8000
+      targetPort: 8000
+  selector:
+    ecoman: executor

kubernetes/executor.yml

@@ -0,0 +1,7 @@
+hoge:
+  addr: "hoge.a910.tak-cslab.org"
+  username: "root"
+  identity_file_path: "/keys/id_rsa"
+  datastore_path: "/vmfs/volumes/datastore1/"
+  installer_iso_path: "/vmfs/volumes/datastore1/os-images/ubuntu2004.iso"
+  network_port_group: "Management Network"

kubernetes/hosts.example.yml

@@ -24,6 +24,7 @@ def get_esxi_nodes() -> dict[str, HostsConfig]:
 
     if os.environ.get("HOSTS_PATH"):
         HOSTS_PATH = str(os.environ.get("HOSTS_PATH"))
+        parent_dir = os.path.dirname(HOSTS_PATH)
     else:
         dir_this_file = os.path.dirname(__file__)
         parent_dir = os.path.join(dir_this_file, "..")
@@ -37,6 +38,10 @@ def get_esxi_nodes() -> dict[str, HostsConfig]:
     for esxi_nodename, conf in hosts_config.items():
         print("Validating:", esxi_nodename)
         try:
+            _path = conf["datastore_path"].endswith("/")
+            if _path:
+                conf["datastore_path"] = conf["datastore_path"][:-2]
+
             hosts_conf = HostsConfig(**conf)
             hosts_conf.identity_file_path = os.path.join(
                 parent_dir, hosts_conf.identity_file_path