Skip to content

Commit

Permalink
Merge pull request #417 from CARV-ICS-FORTH/hpc
Browse files Browse the repository at this point in the history
add examples for mpi jobs
  • Loading branch information
fnikolai authored Jul 4, 2023
2 parents 67a546c + 69cb57c commit 92a65be
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 43 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:

- name: Unit test
run: |
snap alias microk8s.kubectl kubectl
snap alias microk8s.helm3 helm
sudo snap alias microk8s.kubectl kubectl
sudo snap alias microk8s.helm3 helm
# alias kubectl='microk8s kubectl'
# alias helm='microk8s helm3'
Expand Down
4 changes: 2 additions & 2 deletions charts/platform/templates/ingress.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
{{- if .Values.dashboard.enabled}}
{{- if ".Values.kubernetes-dashboard.enabled" }}
# https://stackoverflow.com/questions/54506269/simple-ingress-from-host-with-microk8s
# https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/
apiVersion: networking.k8s.io/v1
Expand All @@ -25,7 +25,7 @@ spec:
number: 443
{{- end}}
---
{{- if .Values.chaos.enabled }}
{{- if ".Values.chaos-mesh.enabled" }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down
72 changes: 72 additions & 0 deletions charts/platform/values-hpk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
## @section Global parameters
## Global Frisbee Platform parameters
## Please, note that this will override the image parameters, including dependencies, configured to use the global value
##
## @param global.domainName DNS name for making Telemetry stack accessible outside the cluster.
## @param global.ingressClass Type of ingres for making Telemetry stack accessible outside the cluster.
global:
domainName: knot-platform.eu
ingressClass: nginx


## @section Frisbee Operator parameters
## @param operator.enabled Set it to false for running the controller outside the Kubernetes Cluster.
## @param operator.name Defines the name of the controller.
## @param operator.advertisedHost Defines the Public IP of the controller, when operator.enabled==false.
## @param operator.webhook.k8s.enabled Enables the Admission webhooks
## @param operator.webhook.k8s.port Sets the port for the Admission/Mutation webhook server.
## @param operator.webhook.grafana.port Sets the port for the telemetry webhook server.
operator:
enabled: true
name: "frisbee-operator"
advertisedHost: "139.91.92.82"
webhook:
k8s:
enabled: true
port: 9443

grafana:
port: 6666

## @section Provision of dynamic volumes
## @param openebs.enabled Whether to enable OpenEBS
## @param openebs.storagePath The filesystem dir where volumes will be provisioned
## @param openebs.nfs-provisioner.enabled Will enable dynamic NFS servers
## @param openebs.ndm.enabled Whether to enable block device management
## @param openebs.ndm.filters.includePaths Include block devices for dynamic block provisioning
## @param openebs.ndm.filters.excludePaths Exclude block devices for dynamic block provisioning
openebs:
enabled: true
storagePath: /mnt/local
nfs-provisioner:
enabled: true
ndm:
enabled: false



## @section Chaos Injection Parameters
## @param chaos-mesh.enabled Whether to enable the Chaos controllers
## @param chaos-mesh.controllerManager.replicaCount Number of Chaos-Mesh controller replicas
## @param chaos-mesh.chaosDaemon.runtime Specifies which container runtime to use.
## @param chaos-mesh.chaosDaemon.socketPath Specifies the container runtime socket.
chaos-mesh:
enabled: false
controllerManager:
replicaCount: 1
chaosDaemon:
runtime: docker
socketPath: /var/run/docker.sock


## @section General purpose, web-based UI for Kubernetes clusters
## @param kubernetes-dashboard.enabled Whether to enable Dashboard
kubernetes-dashboard:
enabled: true


## @param cert-manager.enabled Enables the certificate manager
## @param cert-manager.installCRDs Install CRDs for the certificate manager
cert-manager:
enabled: true
installCRDs: true
7 changes: 2 additions & 5 deletions charts/platform/values-knot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,11 @@ chaos-mesh:


## @section General purpose, web-based UI for Kubernetes clusters

## @param dashboard.enabled Whether to enable Dashboard
dashboard:
## @param kubernetes-dashboard.enabled Whether to enable Dashboard
kubernetes-dashboard:
enabled: true




## @section Certificate Manager

## @param cert-manager.enabled Enables the certificate manager
Expand Down
49 changes: 17 additions & 32 deletions charts/platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,21 @@
## @param global.domainName DNS name for making Telemetry stack accessible outside the cluster.
## @param global.ingressClass Type of ingres for making Telemetry stack accessible outside the cluster.
global:
domainName: localhost
domainName: knot-platform.eu
ingressClass: nginx

ingressClass: public

## @section Frisbee Operator parameters

## @param operator.enabled Set it to false for running the controller outside the Kubernetes Cluster.
## @param operator.name Defines the name of the controller.
## @param operator.advertisedHost Defines the Public IP of the controller, when operator.enabled==false.


## @param operator.webhook.k8s.enabled Enables the Admission webhooks
## @param operator.webhook.k8s.port Sets the port for the Admission/Mutation webhook server.

## @param operator.webhook.grafana.port Sets the port for the telemetry webhook server.
operator:
enabled: true

name: "frisbee-operator"

advertisedHost: "10.1.96.192"

advertisedHost: "139.91.92.82"
webhook:
k8s:
enabled: true
Expand All @@ -36,9 +29,7 @@ operator:
port: 6666



## @section Provision of dynamic volumes

## @param openebs.enabled Whether to enable OpenEBS
## @param openebs.storagePath The filesystem dir where volumes will be provisioned
## @param openebs.nfs-provisioner.enabled Will enable dynamic NFS servers
Expand All @@ -47,41 +38,35 @@ operator:
## @param openebs.ndm.filters.excludePaths Exclude block devices for dynamic block provisioning
openebs:
enabled: true

storagePath: /mnt/local

nfs-provisioner:
enabled: true

ndm:
enabled: true
filters:
includePaths: "" # example /dev/loop7
excludePaths: "/dev/fd0,/dev/sr0,/dev/ram,/dev/dm-,/dev/md,/dev/rbd,/dev/zd"
enabled: false


## @section Chaos Injection Parameters

## @param chaos.enabled Whether to enable the Chaos controllers
chaos:
enabled: true

## @param chaos-mesh.enabled Whether to enable the Chaos controllers
## @param chaos-mesh.controllerManager.replicaCount Number of Chaos-Mesh controller replicas
## @param chaos-mesh.chaosDaemon.runtime Specifies which container runtime to use.
## @param chaos-mesh.chaosDaemon.socketPath Specifies the container runtime socket.
chaos-mesh:
enabled: true
controllerManager:
replicaCount: 1

# If you are using Kind or using containerd as CRI, you can use the
# config below to use containerd as the runtime in chaos-daemon.
chaosDaemon:
runtime: containerd
socketPath: /var/snap/microk8s/common/run/containerd.sock
runtime: docker
socketPath: /var/run/docker.sock


## @section General purpose, web-based UI for Kubernetes clusters
## @param kubernetes-dashboard.enabled Whether to enable Dashboard
kubernetes-dashboard:
enabled: true

## @param dashboard.enabled Whether to enable Dashboard
dashboard:
enabled: false

## @param cert-manager.enabled Enables the certificate manager
## @param cert-manager.installCRDs Install CRDs for the certificate manager
cert-manager:
enabled: true
installCRDs: true
2 changes: 1 addition & 1 deletion examples/apps/mpi-jobs/templates/launcher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
containers:
- image: icsforth/opengadget3:boxes_32
# imagePullPolicy: Always
name: mpi-launcher
name: main
volumeMounts:
# ssh
- name: ssh-volume
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/mpi-jobs/templates/worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
containers:
- image: icsforth/opengadget3:boxes_32
# imagePullPolicy: Always
name: mpi-worker
name: main
volumeMounts:
# ssh
- name: ssh-volume
Expand Down

0 comments on commit 92a65be

Please sign in to comment.