Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Commit

Permalink
ubuntu xonyxia
Browse files Browse the repository at this point in the history
  • Loading branch information
@fcomte
fcomte committed Jul 15, 2022
1 parent 3cd6ccf commit 9103598
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 59 deletions.
2 changes: 1 addition & 1 deletion charts/ubuntu/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.1.0
version: 5.2.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
183 changes: 125 additions & 58 deletions charts/ubuntu/values.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@
"default": "changeme",
"x-form": {
"value": "{{project.password}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{project.password}}"
}
},
"allowlist": {
Expand All @@ -175,23 +178,30 @@
"default": true,
"x-form": {
"value": "{{region.defaultIpProtection}}"
},
"x-onyxia": {
"overwriteDefaultWith": "region.defaultIpProtection"
}
},
"ip": {
"type": "string",
"description": "the white list of IP is whitespace",
"title": "Whitelist of IP",
"description": "the allow list of IP is whitespace",
"title": "Allowed IP",
"default": "0.0.0.0/0",
"x-form": {
"value": "{{user.ip}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{user.ip}}"
},
"hidden": {
"value": false,
"path": "security/allowlist/enabled"
}
"value": false,
"path": "security/allowlist/enabled"
}
}
}
},
"networkPolicy": {
},
"networkPolicy": {
"type": "object",
"description": "Define access policy to the service",
"properties": {
Expand All @@ -202,10 +212,13 @@
"default": true,
"x-form": {
"value": "{{region.defaultNetworkPolicy}}"
},
"x-onyxia": {
"overwriteDefaultWith": "region.defaultNetworkPolicy"
}
}
}
}
}
}
},
"kubernetes": {
Expand All @@ -232,8 +245,8 @@
]
}
}
},
"git": {
},
"git": {
"description": "Git user configuration",
"type": "object",
"properties": {
Expand All @@ -249,6 +262,9 @@
"x-form": {
"value": "{{git.name}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{git.name}}"
},
"hidden": {
"value": false,
"path": "git/enabled"
Expand All @@ -261,6 +277,9 @@
"x-form": {
"value": "{{git.email}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{git.email}}"
},
"hidden": {
"value": false,
"path": "git/enabled"
Expand All @@ -273,6 +292,9 @@
"x-form": {
"value": "{{git.credentials_cache_duration}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{git.credentials_cache_duration}}"
},
"hidden": {
"value": false,
"path": "git/enabled"
Expand All @@ -285,6 +307,9 @@
"x-form": {
"value": "{{git.token}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{git.token}}"
},
"hidden": {
"value": false,
"path": "git/enabled"
Expand All @@ -297,6 +322,9 @@
"x-form": {
"value": "{{git.project}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{git.project}}"
},
"hidden": {
"value": false,
"path": "git/enabled"
Expand All @@ -313,132 +341,159 @@
}
}
},
"s3": {
"description": "Configuration of temporary identity",
"vault": {
"description": "Configuration of vault client",
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"description": "Add S3 temporary identity inside your environment",
"description": "Add vault temporary identity inside your environment",
"default": true
},
"accessKeyId": {
"description": "AWS Access Key",
"token": {
"description": "token vault",
"type": "string",
"x-form": {
"value": "{{s3.AWS_ACCESS_KEY_ID}}"
"value": "{{vault.VAULT_TOKEN}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{vault.VAULT_TOKEN}}"
},
"hidden": {
"value": false,
"path": "s3/enabled"
"path": "vault/enabled"
}
},
"endpoint": {
"description": "AWS S3 Endpoint",
"url": {
"description": "url of vault server",
"type": "string",
"x-form": {
"value": "{{s3.AWS_S3_ENDPOINT}}"
"value": "{{vault.VAULT_ADDR}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{vault.VAULT_ADDR}}"
},
"hidden": {
"value": false,
"path": "s3/enabled"
"path": "vault/enabled"
}
},
"defaultRegion": {
"description": "AWS S3 default region",
"mount": {
"description": "mount of the v2 secret engine",
"type": "string",
"x-form": {
"value": "{{s3.AWS_DEFAULT_REGION}}"
"value": "{{vault.VAULT_MOUNT}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{vault.VAULT_MOUNT}}"
},
"hidden": {
"value": false,
"path": "s3/enabled"
"path": "vault/enabled"
}
},
"secretAccessKey": {
"description": "AWS S3 secret access key",
"directory": {
"description": "top level directory",
"type": "string",
"x-form": {
"value": "{{s3.AWS_SECRET_ACCESS_KEY}}"
"value": "{{vault.VAULT_TOP_DIR}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{vault.VAULT_TOP_DIR}}"
},
"hidden": {
"value": false,
"path": "s3/enabled"
"path": "vault/enabled"
}
},
"sessionToken": {
"description": "AWS S3 session Token",
"secret": {
"description": "the path of the secret to convert into a list of environment variables",
"type": "string",
"x-form": {
"value": "{{s3.AWS_SESSION_TOKEN}}"
},
"default": "",
"hidden": {
"value": false,
"path": "s3/enabled"
"path": "vault/enabled"
}
}
}
},
"vault": {
"description": "Configuration of vault client",
"s3": {
"description": "Configuration of temporary identity",
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"description": "Add vault temporary identity inside your environment",
"description": "Add S3 temporary identity inside your environment",
"default": true
},
"token": {
"description": "token vault",
"accessKeyId": {
"description": "AWS Access Key",
"type": "string",
"x-form": {
"value": "{{vault.VAULT_TOKEN}}"
"value": "{{s3.AWS_ACCESS_KEY_ID}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{s3.AWS_ACCESS_KEY_ID}}"
},
"hidden": {
"value": false,
"path": "vault/enabled"
"path": "s3/enabled"
}
},
"url": {
"description": "url of vault server",
"endpoint": {
"description": "AWS S3 Endpoint",
"type": "string",
"x-form": {
"value": "{{vault.VAULT_ADDR}}"
"value": "{{s3.AWS_S3_ENDPOINT}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{s3.AWS_S3_ENDPOINT}}"
},
"hidden": {
"value": false,
"path": "vault/enabled"
"path": "s3/enabled"
}
},
"mount": {
"description": "mount of the v2 secret engine",
"defaultRegion": {
"description": "AWS S3 default region",
"type": "string",
"x-form": {
"value": "{{vault.VAULT_MOUNT}}"
"value": "{{s3.AWS_DEFAULT_REGION}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{s3.AWS_DEFAULT_REGION}}"
},
"hidden": {
"value": false,
"path": "vault/enabled"
"path": "s3/enabled"
}
},
"directory": {
"description": "top level directory",
"secretAccessKey": {
"description": "AWS S3 secret access key",
"type": "string",
"x-form": {
"value": "{{vault.VAULT_TOP_DIR}}"
"value": "{{s3.AWS_SECRET_ACCESS_KEY}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{s3.AWS_SECRET_ACCESS_KEY}}"
},
"hidden": {
"value": false,
"path": "vault/enabled"
"path": "s3/enabled"
}
},
"secret": {
"description": "the path of the secret to convert into a list of environment variables",
"sessionToken": {
"description": "AWS S3 session Token",
"type": "string",
"default": "",
"x-form": {
"value": "{{s3.AWS_SESSION_TOKEN}}"
},
"x-onyxia": {
"overwriteDefaultWith": "{{s3.AWS_SESSION_TOKEN}}"
},
"hidden": {
"value": false,
"path": "vault/enabled"
"path": "s3/enabled"
}
}
}
Expand All @@ -455,6 +510,10 @@
"x-form": {
"hidden": true,
"value": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
},
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
}
},
"userHostname": {
Expand All @@ -464,6 +523,10 @@
"x-form": {
"hidden": true,
"value": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{k8s.domain}}"
},
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{k8s.domain}}"
}
}
}
Expand Down Expand Up @@ -508,6 +571,10 @@
"x-form": {
"hidden": true,
"value": "{{k8s.initScriptUrl}}"
},
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "{{k8s.initScriptUrl}}"
}
},
"personalInit": {
Expand Down

0 comments on commit 9103598

Please sign in to comment.