Skip to content

Commit

Permalink
fix: schema [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
Maurice Faber committed Jun 28, 2021
1 parent c144bf4 commit 0620836
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 14 deletions.
3 changes: 2 additions & 1 deletion bin/gen-sops.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ function create_from_template() {
create_from_template

echo "Creating and sourcing sops env file for vscode"
helmfile -f helmfile.tpl/helmfile-sops.yaml template | yq d - 'metadata' | yq r -j - | jq -r "with_entries( select( .value != null ) ) | to_entries|map(\"export \(.key)='\(.value|tostring)'\")|.[]" >$ENV_DIR/.sops-creds.env
set -o pipefail
hf -f helmfile.tpl/helmfile-sops.yaml template | yq d - 'metadata' | yq r -j - | jq -r "with_entries( select( .value != null ) ) | to_entries|map(\"export \(.key)='\(.value|tostring)'\")|.[]" >$ENV_DIR/.sops-creds.env
source $ENV_DIR/.sops-creds.env

if [ "$kmsProvider" = "google" ]; then
Expand Down
50 changes: 37 additions & 13 deletions values-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,45 @@ definitions:
x-secret: true
allOf:
- anyOf:
- not:
required:
- receivers
- properties:
receivers:
const: slack
contains:
enum:
- email
required:
- email
- properties:
registry:
required:
- username
- password
- oneOf:
- required:
- slack
- required:
receivers:
contains:
enum:
- msteams
required:
- msteams
- required:
- email
- properties:
receivers:
contains:
enum:
- slack
required:
- slack
- anyOf:
- not:
required:
- drone
- properties:
drone:
const: msteam
required:
- msteam
- properties:
drone:
const: slack
required:
- slack

annotations:
$ref: '#/definitions/labelsAnnotations'
description: A set of annotations.
Expand Down Expand Up @@ -442,8 +466,8 @@ definitions:
labelsAnnotations:
additionalProperties: false
patternProperties:
'^((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]){1,253}\/)?([a-z0-9A-Z]+[a-z0-9A-Z-_.]+[a-z0-9A-Z]){1,63}$':
pattern: '^((.){1,253}\/)?(.){1,63}$'
? '^((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]){1,253}\/)?([a-z0-9A-Z]+[a-z0-9A-Z-_.]+[a-z0-9A-Z]){1,63}$'
: pattern: '^((.){1,253}\/)?(.){1,63}$'
type: string
logLevel:
type: string
Expand Down

0 comments on commit 0620836

Please sign in to comment.