Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/loft-sh/loft into improve…
Browse files Browse the repository at this point in the history
…ments
  • Loading branch information
FabianKramm committed Oct 12, 2020
2 parents 6b4f386 + 3cd2f24 commit dfb6eae
Show file tree
Hide file tree
Showing 163 changed files with 4,804 additions and 2,462 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
yarn
node ./node_modules/mdx-link-checker/index.js pages
yarn build
mv public/* $OUT_DIR/
working-directory: ./docs
- name: Prepare Deployment
run: |
Expand All @@ -47,6 +45,8 @@ jobs:
mkdir -p $TARGET_OUT_DIR
mv tmp-$TARGET_OUT_DIR/* $TARGET_OUT_DIR
mv public/* $OUT_DIR/
npm install -g netlify-cli
fi
working-directory: ./docs
Expand Down
13 changes: 13 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2020 - present DevSpace Technologies, Inc.

Every source code file in this git repository is licensed under Apache License Version 2.0.
You may obtain a copy of the Apache License Version 2.0 at

http://www.apache.org/licenses/LICENSE-2.0

This Apache License Version 2.0 license applies to the source code files in the git repository
that contains this LICENSE file.

The source code files of Loft are **not** contained in this git repository.
Loft is a closed-source product of DevSpace Technologies, Inc. and may be used
solely in accordance with the Loft Terms Of Service: https://loft.sh/terms
28 changes: 28 additions & 0 deletions appstore/repos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1572,3 +1572,31 @@ sync:
email: [email protected]
- name: aledbf
email: [email protected]
- name: lakefs
url: https://charts.lakefs.io
- name: duyet
url: https://duyet.github.io/charts
- name: kvaps
url: https://kvaps.github.io/charts
- name: questdb
url: https://helm.questdb.io
- name: lightstepsatellite
url: https://lightstep.github.io/lightstep-satellite-helm-chart/
- name: fasterbytes
url: https://fasterbytes.github.io/charts
- name: prometheus-community
url: https://prometheus-community.github.io/helm-charts
- name: logicmonitor
url: https://logicmonitor.github.com/k8s-helm-charts
- name: drycc
url: https://charts.drycc.cc/stable
- name: gocd
url: https://gocd.github.io/helm-chart
- name: mongoosehelm
url: https://esl.github.io/MongooseHelm/
- name: k8s-cloudwatch
url: https://awslabs.github.io/k8s-cloudwatch-adapter/charts/k8s-cloudwatch-adapter
- name: cmak-operator
url: https://eshepelyuk.github.io/cmak-operator/
- name: kfirfer
url: https://kfirfer.github.io/helm
2 changes: 1 addition & 1 deletion chart/templates/cluster/local-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: storage.loft.sh/v1
kind: Cluster
metadata:
name: local
name: loft-cluster
annotations:
helm.sh/resource-policy: keep
helm.sh/hook: pre-install
Expand Down
8 changes: 6 additions & 2 deletions chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ spec:
{{- else }}
image: "loftsh/loft:{{ .Chart.Version }}"
{{- end }}
{{- if and .Values.livenessProbe .Values.livenessProbe.enabled }}
{{- if .Values.livenessProbe }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /version
Expand All @@ -41,7 +42,9 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
{{- end }}
{{- if and .Values.readinessProbe .Values.readinessProbe.enabled }}
{{- end }}
{{- if .Values.readinessProbe }}
{{- if .Values.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: /version
Expand All @@ -53,6 +56,7 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
{{- end }}
{{- end }}
env:
{{- if not .Values.apiService.enabled }}
- name: APISERVICE_DISABLED
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
type: ClusterIP
type: {{ .Values.service.type }}
ports:
- name: manager
port: {{ .Values.service.manager.port }}
Expand Down
4 changes: 4 additions & 0 deletions chart/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
{{- if .Values.dev }}
imagePullSecrets:
- name: devspace-auth-docker-pkg-github.aaakk.us.kg
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ resources:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 2Gi
cpu: "2"

apiService:
enabled: true
Expand Down
21 changes: 8 additions & 13 deletions docs/docusaurus.config.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
__webpack_public_path__ = "/docs/"

module.exports = {
title: 'LOFT - Multi-Tenancy Manager for Kubernetes | Documentation',
title: 'Loft Docs | Virtual Clusters & Kubernetes Self-Service Namespaces',
tagline: 'The tagline of my site',
url: 'https://loft.sh',
baseUrl: __webpack_public_path__,
favicon: '/media/loft-favicon.png',
organizationName: 'loft-sh', // Usually your GitHub org/user name.
projectName: 'loft', // Usually your repo name.
themeConfig: {
disableDarkMode: true,
colorMode: {
disableSwitch: true,
},
navbar: {
logo: {
alt: 'loft',
src: '/media/loft-logo.svg',
href: 'https://loft.sh/',
target: '_self',
},
links: [
items: [
{
href: 'https://loft.sh/',
label: 'Website',
Expand Down Expand Up @@ -67,7 +69,7 @@ module.exports = {
{
docs: {
path: 'pages',
routeBasePath: '',
routeBasePath: '/',
sidebarPath: require.resolve('./sidebars.js'),
editUrl:
'https://github.com/loft-sh/loft/edit/master/docs/',
Expand All @@ -78,14 +80,7 @@ module.exports = {
},
],
],
plugins: [
[
require.resolve('docusaurus-gtm-plugin'),
{
id: 'GTM-KGZ3TLD',
}
]
],
plugins: [],
scripts: [
{
src:
Expand All @@ -94,7 +89,7 @@ module.exports = {
},
{
src:
'https://static.devspace.cloud/js/docs/highlight-active-sections.js',
'/docs/js/custom.js',
async: true,
},
],
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"deploy": "docusaurus deploy"
},
"dependencies": {
"@docusaurus/core": "^2.0.0-alpha.56",
"@docusaurus/preset-classic": "^2.0.0-alpha.56",
"@docusaurus/core": "^2.0.0-alpha.64",
"@docusaurus/preset-classic": "^2.0.0-alpha.64",
"classnames": "^2.2.6",
"docusaurus-gtm-plugin": "^0.0.2",
"mdx-link-checker": "^0.0.7",
Expand Down
35 changes: 0 additions & 35 deletions docs/pages/administration/license.mdx

This file was deleted.

34 changes: 0 additions & 34 deletions docs/pages/administration/ssl.mdx

This file was deleted.

17 changes: 17 additions & 0 deletions docs/pages/architecture.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
title: Architecture
sidebar_label: Architecture
---

Loft consists of several components:
- **API Gateway**: The gateway decides based on incoming requests how to route them. They are either routed to an external Kubernetes cluster or the local Loft Kubernetes API Server, or are handled internally.
- **Kubernetes API Server**: The local Kubernetes API server contains the business logic of Loft and introduces a new API group `management.loft.sh`.
- **Kubernetes Operator**: This component watches for changes to User, Team and Cluster objects in the management cluster.

The Loft pod itself is stateless and everything that is stored is stored within Kubernetes custom resource definitions. Most communication (except some OIDC and authentication routes) is done via Kubernetes requests that access the local Loft Kubernetes API server.

<figure>
<img src="/docs/media/loft-architecture.svg" alt="loft Architecture" />
<figcaption>Loft Architecture</figcaption>
</figure>

17 changes: 0 additions & 17 deletions docs/pages/architecture/basics.mdx

This file was deleted.

File renamed without changes.
Loading

0 comments on commit dfb6eae

Please sign in to comment.