Skip to content

Commit

Permalink
wiki markups
Browse files Browse the repository at this point in the history
  • Loading branch information
ebeaty-cisco committed May 16, 2024
1 parent 5ed6d09 commit ccac0f5
Show file tree
Hide file tree
Showing 12 changed files with 147 additions and 187 deletions.
1 change: 0 additions & 1 deletion charts/host-check-app/templates/NOTES.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: host-check-app
name: host-check
description: Cisco XRd host-check application
type: application
keywords:
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions charts/host-check/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
You have installed host-check version {{ .Values.image.tag }}.
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,11 @@ Runtime arguments. If both xrd-control-plane and xrd-vrouter are specified,
the argument is not set.
*/}}
{{- define "hostCheck.args" -}}
{{- if not .Values.platforms }}
{{- fail "Platforms must be specified" }}
{{- end }}
{{- range $platform := .Values.platforms }}
{{- if and (not (eq $platform "xrd-control-plane")) (not (eq $platform "xrd-vrouter")) }}
{{- fail "Invalid platform specified: must be one of xrd-control-plane or xrd-vrouter" }}
{{- end }}
{{- end }}
{{- $arg := "" }}
{{- if eq (len .Values.platforms) 1 }}
{{- $arg = printf "-p, %s" (.Values.platforms | first) }}
{{- if and (has "xrd-control-plane" .Values.targetPlatforms) (has "xrd-vrouter" .Values.targetPlatforms) }}
{{- $arg = "" }}
{{- else }}
{{- $arg = printf "-p, %s" (.Values.targetPlatforms | first) }}
{{- end }}
{{- $arg }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- /* Generate the Job for host-check-app. */ -}}
{{- /* Generate the Job for host-check. */ -}}
apiVersion: batch/v1
kind: Job
metadata:
Expand Down Expand Up @@ -38,12 +38,4 @@ spec:
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 6 }}
{{- end }}
backoffLimit: 0
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft-07/schema",
"$id": "http://cisco.com/xrd/helm",
"title": "host-check-app Helm Chart Values",
"description": "Configuration values for the host-check-app helm charts",
"title": "host-check Helm Chart Values",
"description": "Configuration values for the host-check helm charts",
"type": "object",
"properties": {
"image": {
Expand Down Expand Up @@ -38,8 +38,8 @@
],
"additionalProperties": false
},
"platforms": {
"description": "List of platforms to run the host-check-app on",
"targetPlatforms": {
"description": "List of platforms to run the host-check on",
"type": "array",
"items": {
"type": "string",
Expand All @@ -52,19 +52,11 @@
"nodeSelector": {
"description": "Standard Kubernetes pod nodeSelector object",
"type": "object"
},
"tolerations": {
"description": "Standard Kubernetes pod tolerations array",
"type": "array"
},
"affinity": {
"description": "Standard Kubernetes pod affinity object",
"type": "object"
}
},
"required": [
"image",
"platforms"
"targetPlatforms"
],
"additionalProperties": false
}
23 changes: 10 additions & 13 deletions charts/host-check-app/values.yaml → charts/host-check/values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Default values for host-check-app.
# Default values for host-check.
#
# There are two required fields which have no defaults and must
# be specified for all installations:
# There are required fields which must be specified for all installations:
# - image.repository
# - image.tag
# - platforms

# Image configuration
image:
Expand All @@ -14,21 +14,18 @@ image:
# Pull policy for images.
# One of "IfNotPresent", "Always", or "Never"
# See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
pullPolicy: IfNotPresent
pullPolicy: Always
# Image pull secrets.
# See https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
pullSecrets: []

# Host-check-app configuration
# List of platforms to run host-check-app for.
platforms: []
# Host-check configuration
# List of target platforms to run host-check for (required).
# Valid options are xrd-vrouter and xrd-control-plane.
#targetPlatforms: []

# Location control for the host-check-app Pod.
# Location control for the host-check Pod.
# Standard K8s configuration, more information available at:
# https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
# Node labels for pod assignment.
nodeSelector: {}
# List of node taints to tolerate.
tolerations: []
# Affinity for pod assignment.
affinity: {}
nodeSelector: {}

Check failure on line 31 in charts/host-check/values.yaml

View workflow job for this annotation

GitHub Actions / helm-sa

31:17 [new-line-at-end-of-file] no new line character at the end of file
140 changes: 0 additions & 140 deletions tests/ut/host-check-app/job.bats

This file was deleted.

Loading

0 comments on commit ccac0f5

Please sign in to comment.