Skip to content

Commit

Permalink
feat: major refactor, deprecated xcat for grendel
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkness4 committed Apr 21, 2023
1 parent 61d2a2a commit 57fd581
Show file tree
Hide file tree
Showing 77 changed files with 934 additions and 5,993 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This repository is where [SquareFactory](https://www.squarefactory.io) develops
- GitOps-enabled with [ArgoCD](https://docs.clusterfactory.io/docs/main-concepts/gitops/argocd) and [Sealed Secrets](https://docs.clusterfactory.io/docs/main-concepts/gitops/sealed-secrets)
- VM workloads with KubeVirt
- Bare-metal workloads with [Slurm](https://docs.clusterfactory.io/docs/main-concepts/apps/slurm)
- Bare-metal provisioning with [xCAT](https://docs.clusterfactory.io/docs/main-concepts/apps/xcat)
- Bare-metal provisioning with [Grendel](https://docs.clusterfactory.io/docs/main-concepts/apps/grendel)
- Supports CNI plugins with [Multus CNI](https://docs.clusterfactory.io/docs/main-concepts/core-network/multus-cni)
- TLS/SSL certificates management with [cert-manager](https://docs.clusterfactory.io/docs/main-concepts/gitops/cert-manager)
- Mirror of DeepSquare's software library (end user software) by using [CVMFS Stratum 1](https://docs.clusterfactory.io/docs/main-concepts/apps/cvmfs)
Expand Down
Empty file removed argo.example/ldap/volumes/.gitkeep
Empty file.
26 changes: 0 additions & 26 deletions argo.example/ldap/volumes/389ds-at-vie-nfs.yaml.example

This file was deleted.

26 changes: 0 additions & 26 deletions argo.example/ldap/volumes/openldap-nfs.yaml.example

This file was deleted.

25 changes: 25 additions & 0 deletions argo.example/local-path-storage/app-project.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
apiVersion: argoproj.io/v1alpha1
kind: AppProject
metadata:
name: local-path-storage
namespace: argocd
# Finalizer that ensures that project is not deleted until it is not referenced by any application
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
description: Local Path Storage
# Allow manifests to deploy from any Git repos
sourceRepos:
- '*'
# Only permit applications to deploy to the namespace in the same cluster
destinations:
- namespace: local-path-storage
server: https://kubernetes.default.svc

namespaceResourceWhitelist:
- kind: '*'
group: '*'

clusterResourceWhitelist:
- kind: '*'
group: '*'
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: local-path-provisioner-app
name: local-path-storage-app
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
project: default
project: local-path-storage
source:
repoURL: https://github.com/rancher/local-path-provisioner.git
targetRevision: v0.0.24
path: deploy
kustomize:
kustomize: {}

destination:
server: 'https://kubernetes.default.svc'
namespace: default
namespace: local-path-storage

syncPolicy:
automated:
Expand Down
6 changes: 6 additions & 0 deletions argo.example/local-path-storage/namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: local-path-storage
labels:
app.kubernetes.io/name: local-path-storage
26 changes: 0 additions & 26 deletions argo.example/monitoring/volumes/grafana-nfs.yaml.example

This file was deleted.

26 changes: 0 additions & 26 deletions argo.example/monitoring/volumes/prometheus-nfs.yaml.example

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: xcat-app
name: grendel-app
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
Expand All @@ -12,9 +12,9 @@ spec:
repoURL: git@github.com:squarefactory/ClusterFactory.git
# You should use your branch too.
targetRevision: HEAD
path: helm/xcat
path: helm/grendel
helm:
releaseName: xcat
releaseName: grendel

# Create a values file inside your fork and change the values.
valueFiles:
Expand Down
4 changes: 2 additions & 2 deletions argo.example/provisioning/secrets/grendel-secret.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ stringData:
# By default, all loggers are on. You can turn off logging for specific
# services here.
#
loggers = {cli="on", tftp="off", dhcp="on", dns="off", provision="on", api="on", pxe="off"}
loggers = {cli="on", tftp="on", dhcp="on", dns="off", provision="on", api="on", pxe="on"}

#
# Admin ssh public keys. These are used in provision templates and elsewhere for
Expand Down Expand Up @@ -104,7 +104,7 @@ stringData:
# 10.17.40.0/23 and if so set the dhcp gateway/router to 10.17.41.254.
#
subnets = [
{gateway = "10.10.2.1/24", dns="10.10.4.100", domainSearch="ch1.deepsquare.run", mtu="1500"}
{gateway = "192.168.0.1/24", dns="192.168.0.100", domainSearch="example.com", mtu="1500"}
]

#------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: v1
kind: Secret
metadata:
name: postscript-privatekey-secret
namespace: provisioning
type: Opaque
stringData:
## Create the key with:
## ssh-keygen -f $(pwd)/key -C grendel
## Encrypt with:
## openssl enc -aes-256-cbc -a -salt -pbkdf2 -in key -out key.enc
key.enc: ""
26 changes: 0 additions & 26 deletions argo.example/provisioning/volumes/xcat-nfs.yaml.example

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: PersistentVolume
metadata:
name: ldap-users-example-pv
namespace: slurm-cluster
labels:
app: slurm-login
topology.kubernetes.io/region: ch-sion
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: harbor-nfs
namespace: ldap
name: dynamic-nfs
labels:
app: harbor
topology.kubernetes.io/region: ch-sion
topology.kubernetes.io/zone: ch-sion-1
provisioner: nfs.csi.k8s.io
parameters:
server: nfs.example.com
share: /srv/nfs/k8s/harbor
share: /srv/nfs/dynamic
mountPermissions: '0775'
mountOptions:
- hard
Expand Down
2 changes: 1 addition & 1 deletion core.example/coredns/overlays/prod/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ data:
example.com.db: |
192.168.0.1 gateway.example.com
192.168.0.2 mn1.example.com
192.168.0.3 xcatmn.example.com
192.168.0.3 grendel.example.com
192.168.0.5 cvmfs.example.com
192.168.0.6 nfs.example.com
192.168.0.7 mysql.example.com
Expand Down
55 changes: 0 additions & 55 deletions helm/cvmfs-server/values-example.yaml

This file was deleted.

Loading

0 comments on commit 57fd581

Please sign in to comment.