Browse Source

Reorder Sonobuoy's values.yaml to follow spec

The values.yaml functionality is the same, just reordered according
to the values ordering spec[1].

[1] https://docs.openstack.org/openstack-helm/latest/specs/values-ordering.html

Change-Id: If31867e7b75b126880f61a57ac11a437c3519663
Dustin Specker 6 months ago
parent
commit
5a610a290d
1 changed files with 23 additions and 28 deletions
  1. 23
    28
      sonobuoy/values.yaml

+ 23
- 28
sonobuoy/values.yaml View File

@@ -12,25 +12,30 @@
12 12
 # See the License for the specific language governing permissions and
13 13
 # limitations under the License.
14 14
 
15
-# Default values for Sonobuoy.
16
-# This is a YAML-formatted file.
17
-# Declare name/value pairs to be passed into your templates.
18
-# name: value
19
-
20
-labels:
21
-  api:
22
-    node_selector_key: openstack-control-plane
23
-    node_selector_value: enabled
24
-
25 15
 images:
26 16
   tags:
27 17
     sonobuoy_api: gcr.io/heptio-images/sonobuoy:v0.11.4
28 18
     systemd_logs: gcr.io/heptio-images/sonobuoy-plugin-systemd-logs:v0.1
29
-  pull_policy: IfNotPresent
19
+  pull_policy: "IfNotPresent"
30 20
   local_registry:
31 21
     active: false
32 22
     exclude: []
33 23
 
24
+labels:
25
+  api:
26
+    node_selector_key: openstack-control-plane
27
+    node_selector_value: enabled
28
+
29
+dependencies:
30
+  dynamic: {}
31
+  static: {}
32
+
33
+manifests:
34
+  configmap_bin: true
35
+  configmap_plugins: true
36
+  pod_api: true
37
+  secret_etc: true
38
+
34 39
 conf:
35 40
   sonobuoy:
36 41
     Description: "sonobuoy run for scanner.heptio.com"
@@ -63,22 +68,22 @@ conf:
63 68
           plugin-name: systemd-logs
64 69
           result-type: systemd_logs
65 70
         spec:
66
-          command:
67
-          - sh
68
-          - -c
69
-          - /get_systemd_logs.sh && sleep 3600
71
+          name: sonobuoy-systemd-logs-config
70 72
           env:
73
+          - name: CHROOT_DIR
74
+            value: /node
71 75
           - name: NODE_NAME
72 76
             valueFrom:
73 77
               fieldRef:
74 78
                 fieldPath: spec.nodeName
75 79
           - name: RESULTS_DIR
76 80
             value: /tmp/results
77
-          - name: CHROOT_DIR
78
-            value: /node
79 81
           image: {{ .Values.images.tags.systemd_logs }}
80 82
           imagePullPolicy: Always
81
-          name: sonobuoy-systemd-logs-config
83
+          command:
84
+          - sh
85
+          - -c
86
+          - /get_systemd_logs.sh && sleep 3600
82 87
           securityContext:
83 88
             privileged: true
84 89
           volumeMounts:
@@ -88,13 +93,3 @@ conf:
88 93
           - mountPath: /node
89 94
             name: root
90 95
             readOnly: false
91
-
92
-dependencies:
93
-  dynamic: {}
94
-  static: {}
95
-
96
-manifests:
97
-  configmap_bin: true
98
-  configmap_plugins: true
99
-  pod_api: true
100
-  secret_etc: true

Loading…
Cancel
Save