public/helm-charts
1
0
Fork 0
mirror of https://github.com/bjw-s-labs/helm-charts.git synced 2025-07-03 16:37:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat(common): Release common-3.0.4 (#294)

Browse source
This commit is contained in:
Bernd Schorgers 2024-03-15 09:33:07 +01:00 • committed by GitHub
parent 9541ab44fe
commit 23164367ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
89 changed files with 427 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

7
charts/library/common/Chart.yaml
View file

@ -3,7 +3,7 @@ apiVersion: v2
name: common
description: Function library for Helm charts
type: library
version: 3.0.3
version: 3.0.4
kubeVersion: ">=1.22.0-0"
keywords:
- common
@ -16,7 +16,4 @@ annotations:
artifacthub.io/changes: |-
- kind: fixed
description: |-
Fixed probes intermittently choosing the wrong service
- kind: fixed
description: |-
Prevent potential incorrect controller references
Improved fix for preventing potential incorrect controller references

4
charts/library/common/README.md
View file

@ -1,6 +1,6 @@
# common
![Version: 3.0.3](https://img.shields.io/badge/Version-3.0.3-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
![Version: 3.0.4](https://img.shields.io/badge/Version-3.0.4-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
Function library for Helm charts
@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
# Chart.yaml
dependencies:
- name: common
version: 3.0.3
version: 3.0.4
repository: https://bjw-s.github.io/helm-charts/
```

188
charts/library/common/schemas/containers.json
View file

@ -36,14 +36,13 @@
]
},
"env": {
"anyOf": [
"oneOf": [
{
"type": "array",
"items": {
"anyOf": [
{"$ref": "#/envValueWithName"},
{"$ref": "#/envValueFromWithName"},
{"$ref": "#/envImplicitValueFromWithName"}
{"$ref": "envVars.json#/envVarListItem"},
{"$ref": "envVars.json#/valueFromListItem"}
]
}
},
@ -51,10 +50,9 @@
"type": "object",
"additionalProperties": {
"anyOf": [
{"type": ["string", "number", "boolean", "null"]},
{"$ref": "#/envValue"},
{"$ref": "#/envValueFrom"},
{"$ref": "#/envImplicitValueFrom"}
{"$ref": "envVars.json#/envVarValue"},
{"$ref": "envVars.json#/envVarItem"},
{"$ref": "envVars.json#/valueFromItem"}
]
}
}
@ -164,180 +162,6 @@
}
},
"envValueWithName": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"value": {
"type": ["string", "number", "boolean", "null"]
}
},
"required": ["name", "value"]
},
"envValue": {
"type": "object",
"additionalProperties": false,
"properties": {
"value": {
"type": ["string", "number", "boolean", "null"]
},
"dependsOn": {"$ref": "#/envDependsOn"}
},
"required": ["value"]
},
"envValueFromWithName": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"valueFrom": {
"oneOf": [
{"$ref": "#/envValueFrom.fieldRef"},
{"$ref": "#/envValueFrom.secretKeyRef"}
]
},
"dependsOn": {"$ref": "#/envDependsOn"}
},
"required": ["name", "valueFrom"]
},
"envValueFrom": {
"type": "object",
"additionalProperties": false,
"properties": {
"valueFrom": {
"oneOf": [
{"$ref": "#/envValueFrom.fieldRef"},
{"$ref": "#/envValueFrom.secretKeyRef"}
]
},
"dependsOn": {"$ref": "#/envDependsOn"}
},
"required": ["valueFrom"]
},
"envImplicitValueFromWithName": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"fieldRef": {"$ref": "#/envValueFrom.fieldPath"},
"secretKeyRef": {"$ref": "#/envValueFrom.secretKeyRef"},
"configMapKeyRef": {"$ref": "#/envValueFrom.configMapKeyRef"}
},
"required": ["name"],
"dependencies": {
"fieldRef": {
"allOf": [
{"not": {"required": ["secretKeyRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"secretKeyRef": {
"allOf": [
{"not": {"required": ["fieldRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"configMapKeyRef": {
"allOf": [
{"not": {"required": ["secretKeyRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
}
}
},
"envImplicitValueFrom": {
"type": "object",
"oneOf": [
{"$ref": "#/envValueFrom.fieldRef"},
{"$ref": "#/envValueFrom.secretKeyRef"},
{"$ref": "#/envValueFrom.configMapKeyRef"}
]
},
"envDependsOn": {
"oneOf": [
{"type": "string"},
{"type": "array", "items": {"type": "string"}}
]
},
"envValueFrom.secretKeyRef": {
"type": "object",
"additionalProperties": false,
"properties": {
"secretKeyRef": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"key": {
"type": "string"
}
},
"required": ["name", "key"]
}
},
"required": ["secretKeyRef"]
},
"envValueFrom.configMapKeyRef": {
"type": "object",
"additionalProperties": false,
"properties": {
"configMapKeyRef": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"key": {
"type": "string"
}
},
"required": ["name", "key"]
}
},
"required": ["configMapKeyRef"]
},
"envValueFrom.fieldRef": {
"type": "object",
"additionalProperties": false,
"properties": {
"fieldRef": {
"$ref": "#/envValueFrom.fieldPath"
}
},
"required": ["fieldRef"]
},
"envValueFrom.fieldPath": {
"type": "object",
"additionalProperties": false,
"properties": {
"apiVersion": {
"type": "string"
},
"fieldPath": {
"type": "string"
}
},
"required": ["fieldPath"]
},
"probe": {
"additionalProperties": false,
"properties": {

245
charts/library/common/schemas/envVars.json Normal file
View file

@ -0,0 +1,245 @@
{
"envVarValue": {
"type": ["string", "number", "boolean", "null"]
},
"envVarListItem": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {"type": "string"},
"value": {"$ref": "#/envVarValue"}
},
"required": ["name", "value"]
},
"envVarItem": {
"type": "object",
"additionalProperties": false,
"properties": {
"value": {"$ref": "#/envVarValue"},
"dependsOn": {"$ref": "#/envVarDependsOn"}
},
"required": ["value"]
},
"valueFromListItem": {
"oneOf": [
{"$ref": "#/valueFromListItemExplicit"},
{"$ref": "#/valueFromListItemImplicit"}
]
},
"valueFromListItemExplicit": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {"type": "string"},
"valueFrom": {"$ref": "#/valueFromOptions"}
},
"required": ["name", "valueFrom"]
},
"valueFromListItemImplicit": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {"type": "string"},
"fieldRef": {"$ref": "#/fieldRefSelector"},
"resourceFieldRef": {"$ref": "#/resourceFieldRefSelector"},
"secretKeyRef": {"$ref": "#/objectKeySelector"},
"configMapKeyRef": {"$ref": "#/objectKeySelector"}
},
"required": ["name"],
"dependencies": {
"fieldRef": {
"allOf": [
{"not": {"required": ["resourceFieldRef"]}},
{"not": {"required": ["secretKeyRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"resourceFieldRef": {
"allOf": [
{"not": {"required": ["fieldRef"]}},
{"not": {"required": ["secretKeyRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"secretKeyRef": {
"allOf": [
{"not": {"required": ["fieldRef"]}},
{"not": {"required": ["resourceFieldRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"configMapKeyRef": {
"allOf": [
{"not": {"required": ["fieldRef"]}},
{"not": {"required": ["resourceFieldRef"]}},
{"not": {"required": ["secretKeyRef"]}}
]
}
}
},
"valueFromItem": {
"oneOf": [
{"$ref": "#/valueFromItemExplicit"},
{"$ref": "#/valueFromItemImplicit"}
]
},
"valueFromItemExplicit": {
"type": "object",
"additionalProperties": false,
"properties": {
"valueFrom": {"$ref": "#/valueFromOptions"},
"dependsOn": {"$ref": "#/envVarDependsOn"}
},
"required": ["valueFrom"]
},
"valueFromItemImplicit": {
"type": "object",
"additionalProperties": false,
"properties": {
"fieldRef": {"$ref": "#/fieldRefSelector"},
"resourceFieldRef": {"$ref": "#/resourceFieldRefSelector"},
"secretKeyRef": {"$ref": "#/objectKeySelector"},
"configMapKeyRef": {"$ref": "#/objectKeySelector"},
"dependsOn": {"$ref": "#/envVarDependsOn"}
},
"dependencies": {
"fieldRef": {
"allOf": [
{"not": {"required": ["resourceFieldRef"]}},
{"not": {"required": ["secretKeyRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"resourceFieldRef": {
"allOf": [
{"not": {"required": ["fieldRef"]}},
{"not": {"required": ["secretKeyRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"secretKeyRef": {
"allOf": [
{"not": {"required": ["fieldRef"]}},
{"not": {"required": ["resourceFieldRef"]}},
{"not": {"required": ["configMapKeyRef"]}}
]
},
"configMapKeyRef": {
"allOf": [
{"not": {"required": ["fieldRef"]}},
{"not": {"required": ["resourceFieldRef"]}},
{"not": {"required": ["secretKeyRef"]}}
]
}
}
},
"valueFromOptions": {
"type": "object",
"oneOf": [
{"$ref": "#/fieldRef"},
{"$ref": "#/resourceFieldRef"},
{"$ref": "#/secretKeyRef"},
{"$ref": "#/configMapKeyRef"}
]
},
"secretKeyRef": {
"type": "object",
"additionalProperties": false,
"properties": {
"secretKeyRef": {"$ref": "#/objectKeySelector"}
},
"required": ["secretKeyRef"]
},
"configMapKeyRef": {
"type": "object",
"additionalProperties": false,
"properties": {
"configMapKeyRef": {"$ref": "#/objectKeySelector"}
},
"required": ["configMapKeyRef"]
},
"fieldRef": {
"type": "object",
"additionalProperties": false,
"properties": {
"fieldRef": {"$ref": "#/fieldRefSelector"}
},
"required": ["fieldRef"]
},
"fieldRefSelector": {
"type": "object",
"additionalProperties": false,
"properties": {
"apiVersion": {
"type": "string"
},
"fieldPath": {
"type": "string"
}
},
"required": ["fieldPath"]
},
"resourceFieldRef": {
"type": "object",
"additionalProperties": false,
"properties": {
"resourceFieldRef": {"$ref": "#/resourceFieldRefSelector"}
},
"required": ["resourceFieldRef"]
},
"resourceFieldRefSelector": {
"type": "object",
"additionalProperties": false,
"properties": {
"containerName": {
"type": "string"
},
"divisor": {
"oneOf": [{"type": "string"}, {"type": "number"}]
},
"resource": {
"type": "string"
}
},
"required": ["resource"]
},
"envVarDependsOn": {
"oneOf": [
{"type": "string"},
{
"type": "array",
"items": {"type": "string"}
}
]
},
"objectKeySelector": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"key": {
"type": "string"
}
},
"required": ["name", "key"]
}
}

4
charts/library/common/templates/lib/service/_primary_port.tpl
View file

@ -18,7 +18,9 @@ Return the primary port for a given Service object.
{{- /* Return the first port if none has been explicitly marked as primary */ -}}
{{- if not $result -}}
{{- $firstPortKey := keys $enabledPorts | first -}}
{{- $result = get $enabledPorts $firstPortKey -}}
{{- if $firstPortKey -}}
{{- $result = get $enabledPorts $firstPortKey -}}
{{- end -}}
{{- end -}}
{{- $result | toYaml -}}

2
charts/library/common/values.schema.json
View file

@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.0.3/charts/library/common/values.schema.json",
"$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.0.4/charts/library/common/values.schema.json",
"type": "object",
"properties": {