Skip to content

Commit

Permalink
Update Java service chart
Browse files Browse the repository at this point in the history
  • Loading branch information
@mickaelbaron
mickaelbaron committed Sep 24, 2024
1 parent 525feb5 commit 2352555
Show file tree
Hide file tree
Showing 3 changed files with 194 additions and 76 deletions.
2 changes: 1 addition & 1 deletion charts/java-maven-vscode/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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: 1.0.0
version: 1.0.1

dependencies:
- name: library-chart
Expand Down
251 changes: 176 additions & 75 deletions charts/java-maven-vscode/values.schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/schema#",
"$schema": "http://json-schema.org/draft-07/schema",
"type": "object",
"properties": {
"service": {
"description": "spark-history specific configuration",
"description": "Service specific configuration",
"type": "object",
"properties": {
"image": {
Expand Down Expand Up @@ -43,7 +43,10 @@
"title": "custom image",
"type": "boolean",
"description": "use a custom vscode docker images",
"default": false
"default": false,
"x-onyxia": {
"overwriteSchemaWith": "ide/customImage.json"
}
},
"version": {
"description": "vscode unsupported version",
Expand All @@ -63,6 +66,9 @@
"resources": {
"description": "Your service will have at least the requested resources and never more than its limits. No limit for a resource and you can consume everything left on the host machine.",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/resources.json"
},
"properties": {
"requests": {
"description": "Guaranteed resources",
Expand Down Expand Up @@ -93,7 +99,7 @@
"default": "2Gi",
"render": "slider",
"sliderMin": 1,
"sliderMax": 32,
"sliderMax": 200,
"sliderStep": 1,
"sliderUnit": "Gi",
"sliderExtremity": "down",
Expand Down Expand Up @@ -132,10 +138,10 @@
"description": "The maximum amount of memory",
"title": "Memory",
"type": "string",
"default": "10Gi",
"default": "50Gi",
"render": "slider",
"sliderMin": 1,
"sliderMax": 32,
"sliderMax": 200,
"sliderStep": 1,
"sliderUnit": "Gi",
"sliderExtremity": "up",
Expand All @@ -153,6 +159,9 @@
"persistence": {
"description": "Configuration for persistence",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/persistence.json"
},
"properties": {
"enabled": {
"type": "boolean",
Expand All @@ -167,7 +176,7 @@
"form": true,
"render": "slider",
"sliderMin": 1,
"sliderMax": 50,
"sliderMax": 100,
"sliderStep": 1,
"sliderUnit": "Gi",
"x-onyxia": {
Expand All @@ -184,6 +193,9 @@
"init": {
"description": "Init parameters",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/init.json"
},
"properties": {
"regionInit": {
"type": "string",
Expand Down Expand Up @@ -218,6 +230,9 @@
"kubernetes": {
"description": "configuration of your kubernetes access",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/role.json"
},
"properties": {
"enabled": {
"type": "boolean",
Expand All @@ -232,17 +247,48 @@
"value": false,
"path": "kubernetes/enabled"
},
"enum": [
"listEnum": [
"view",
"edit",
"admin"
]
],
"render": "list"
}
}
},
"openshiftSCC": {
"description": "configuration for openshift compatibility",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/openshiftSCC.json"
},
"properties": {
"enabled": {
"description": "enable rolebinding with openshift scc",
"type": "boolean",
"default": false,
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "region.openshiftSCC.enabled"
}
},
"scc": {
"type": "string",
"description": "name of scc for rolebinding",
"default": "anyuid",
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "region.openshiftSCC.scc"
}
}
}
},
"vault": {
"description": "Configuration of vault client",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/vault.json"
},
"properties": {
"enabled": {
"type": "boolean",
Expand Down Expand Up @@ -308,6 +354,9 @@
"s3": {
"description": "Configuration of temporary identity",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/s3.json"
},
"properties": {
"enabled": {
"type": "boolean",
Expand Down Expand Up @@ -376,6 +425,9 @@
"git": {
"description": "Git user configuration",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "ide/git.json"
},
"properties": {
"enabled": {
"type": "boolean",
Expand Down Expand Up @@ -508,74 +560,56 @@
}
},
"security": {
"description": "security specific configuration",
"type": "object",
"properties": {
"password": {
"type": "string",
"description": "Password",
"default": "changeme",
"render": "password",
"x-onyxia": {
"overwriteDefaultWith": "{{service.oneTimePassword}}"
}
},
"allowlist": {
"type": "object",
"description": "IP protection",
"properties": {
"enabled": {
"type": "boolean",
"title": "Enable IP protection",
"description": "Only the configured set of IPs will be able to reach the service",
"default": true,
"x-onyxia": {
"overwriteDefaultWith": "region.defaultIpProtection"
}
},
"ip": {
"type": "string",
"description": "the white list of IP is whitespace",
"title": "Whitelist of IP",
"x-onyxia": {
"overwriteDefaultWith": "{{user.ip}}"
}
}
}
},
"networkPolicy": {
"type": "object",
"description": "Define access policy to the service",
"properties": {
"enabled": {
"type": "boolean",
"title": "Enable network policy",
"description": "Only pod from the same namespace will be allowed",
"default": true,
"x-onyxia": {
"overwriteDefaultWith": "region.defaultNetworkPolicy"
}
"description": "security specific configuration",
"type": "object",
"properties": {
"password": {
"type": "string",
"description": "Password",
"default": "changeme",
"render": "password",
"x-onyxia": {
"overwriteDefaultWith": "{{service.oneTimePassword}}",
"overwriteSchemaWith": "ide/password"
}
},
"from": {
"type": "array",
"description": "Array of source allowed to have network access to your service",
"default": [],
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "region.from"
}
"networkPolicy": {
"type": "object",
"description": "Define access policy to the service",
"x-onyxia": {
"overwriteSchemaWith": "network-policy.json"
},
"properties": {
"enabled": {
"type": "boolean",
"title": "Enable network policy",
"description": "Only pod from the same namespace will be allowed",
"default": false,
"x-onyxia": {
"overwriteDefaultWith": "region.defaultNetworkPolicy"
}
},
"from": {
"type": "array",
"description": "Array of source allowed to have network access to your service",
"default": [],
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "region.from"
}
}
}
}
}
}
}
},
"nodeSelector": {
"type": "object",
"description": "NodeSelector",
"default": {},
"x-onyxia": {
"hidden": false,
"overwriteDefaultWith": "region.nodeSelector"
"hidden": false,
"overwriteDefaultWith": "region.nodeSelector",
"overwriteSchemaWith": "nodeSelector.json"
}
},
"ingress": {
Expand Down Expand Up @@ -677,20 +711,28 @@
},
"startupProbe": {
"type": "object",
"description": "Start up probe",
"default": {},
"description": "Startup probe",
"default": {
"failureThreshold": 60,
"initialDelaySeconds": 10,
"periodSeconds": 10,
"successThreshold": 1,
"timeoutSeconds": 2
},
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "region.startupProbe"
"hidden": true,
"overwriteDefaultWith": "region.startupProbe",
"overwriteSchemaWith": "ide/startupProbe.json"
}
},
"tolerations": {
"type": "array",
"description": "Array of tolerations",
"default": [],
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "region.tolerations"
"hidden": true,
"overwriteDefaultWith": "region.tolerations",
"overwriteSchemaWith": "tolerations.json"
}
},
"userPreferences": {
Expand Down Expand Up @@ -730,6 +772,65 @@
}
}
}
},
"proxy": {
"description": "It can be used to inject proxy settings in the services",
"type": "object",
"x-onyxia": {
"overwriteSchemaWith": "proxy.json"
},
"properties": {
"enabled": {
"type": "boolean",
"description": "Inject proxy settings",
"default": false
},
"httpProxy": {
"type": "string",
"description": "URL of the enterprise proxy for the region for HTTP.",
"default": "",
"hidden": {
"value": false,
"path": "proxy/enabled"
}
},
"httpsProxy": {
"type": "string",
"description": "URL of the enterprise proxy for the region for HTTPS.",
"default": "",
"hidden": {
"value": false,
"path": "proxy/enabled"
}
},
"noProxy": {
"type": "string",
"description": "enterprise local domain that should not take proxy comma separated",
"default": "",
"hidden": {
"value": false,
"path": "proxy/enabled"
}
}
}
},
"message": {
"type": "object",
"description": "Warning message",
"x-onyxia": {
"hidden": true,
"overwriteSchemaWith": "ide/message.json"
},
"properties":{
"fr": {
"type": "string",
"description": "message à ajouter dans les notes",
"default": ""},
"en": {
"type": "string",
"description": "message to add in notes",
"default": ""}
}
}
}
}
}
Loading

0 comments on commit 2352555

Please sign in to comment.