Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow setting aggregator env vars via CLI
In a few situations we may want to set env vars on the aggregator via the CLI. This is just a convenience change but makes the plugin name `sonobuoy` reserved to avoid an issue. Signed-off-by: John Schnake <jschnake@vmware.com>
- Loading branch information
1 parent
928b7b4
commit 94b6f18
Showing
3 changed files
with
281 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
248 changes: 248 additions & 0 deletions
248
test/integration/testdata/gen-plugin-env-sonobuoy.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
| name: sonobuoy | ||
| --- | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| labels: | ||
| component: sonobuoy | ||
| name: sonobuoy-serviceaccount | ||
| namespace: sonobuoy | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
| labels: | ||
| component: sonobuoy | ||
| namespace: sonobuoy | ||
| name: sonobuoy-serviceaccount-sonobuoy | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: sonobuoy-serviceaccount-sonobuoy | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: sonobuoy-serviceaccount | ||
| namespace: sonobuoy | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| labels: | ||
| component: sonobuoy | ||
| namespace: sonobuoy | ||
| name: sonobuoy-serviceaccount-sonobuoy | ||
| rules: | ||
| - apiGroups: | ||
| - '*' | ||
| resources: | ||
| - '*' | ||
| verbs: | ||
| - '*' | ||
| - nonResourceURLs: | ||
| - /metrics | ||
| - /logs | ||
| - /logs/* | ||
| verbs: | ||
| - get | ||
| --- | ||
| apiVersion: v1 | ||
| data: | ||
| config.json: '{"Description":"DEFAULT","UUID":"","Version":"*STATIC_FOR_TESTING*","ResultsDir":"/tmp/sonobuoy/results","Resources":null,"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"Namespaces":"kube-system","SonobuoyNamespace":true,"FieldSelectors":[],"LabelSelector":"","Previous":false,"SinceSeconds":null,"SinceTime":null,"Timestamps":false,"TailLines":null,"LimitBytes":null}},"QPS":30,"Burst":50,"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":21600},"Plugins":null,"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"sonobuoy","WorkerImage":"sonobuoy/sonobuoy:*STATIC_FOR_TESTING*","ImagePullPolicy":"IfNotPresent","ImagePullSecrets":"","AggregatorPermissions":"clusterAdmin","ProgressUpdatesPort":"8099","SecurityContextMode":"nonroot"}' | ||
| kind: ConfigMap | ||
| metadata: | ||
| labels: | ||
| component: sonobuoy | ||
| name: sonobuoy-config-cm | ||
| namespace: sonobuoy | ||
| --- | ||
| apiVersion: v1 | ||
| data: | ||
| plugin-0.yaml: |- | ||
| podSpec: | ||
| containers: [] | ||
| nodeSelector: | ||
| kubernetes.io/os: linux | ||
| restartPolicy: Never | ||
| serviceAccountName: sonobuoy-serviceaccount | ||
| tolerations: | ||
| - effect: NoSchedule | ||
| key: node-role.kubernetes.io/master | ||
| operator: Exists | ||
| - key: CriticalAddonsOnly | ||
| operator: Exists | ||
| - key: kubernetes.io/e2e-evict-taint-key | ||
| operator: Exists | ||
| sonobuoy-config: | ||
| driver: Job | ||
| plugin-name: e2e | ||
| result-format: junit | ||
| spec: | ||
| command: | ||
| - /run_e2e.sh | ||
| env: | ||
| - name: E2E_EXTRA_ARGS | ||
| value: --progress-report-url=http://localhost:8099/progress | ||
| - name: E2E_FOCUS | ||
| value: \[Conformance\] | ||
| - name: E2E_PARALLEL | ||
| value: "false" | ||
| - name: E2E_SKIP | ||
| value: \[Disruptive\]|NoExecuteTaintManager | ||
| - name: E2E_USE_GO_RUNNER | ||
| value: "true" | ||
| - name: RESULTS_DIR | ||
| value: /tmp/sonobuoy/results | ||
| - name: SONOBUOY | ||
| value: "true" | ||
| - name: SONOBUOY_CONFIG_DIR | ||
| value: /tmp/sonobuoy/config | ||
| - name: SONOBUOY_K8S_VERSION | ||
| value: ignore | ||
| - name: SONOBUOY_PROGRESS_PORT | ||
| value: "8099" | ||
| - name: SONOBUOY_RESULTS_DIR | ||
| value: /tmp/sonobuoy/results | ||
| image: k8s.gcr.io/conformance:ignore | ||
| imagePullPolicy: IfNotPresent | ||
| name: e2e | ||
| volumeMounts: | ||
| - mountPath: /tmp/sonobuoy/results | ||
| name: results | ||
| plugin-1.yaml: |- | ||
| podSpec: | ||
| containers: [] | ||
| dnsPolicy: ClusterFirstWithHostNet | ||
| hostIPC: true | ||
| hostNetwork: true | ||
| hostPID: true | ||
| nodeSelector: | ||
| kubernetes.io/os: linux | ||
| serviceAccountName: sonobuoy-serviceaccount | ||
| tolerations: | ||
| - operator: Exists | ||
| volumes: | ||
| - hostPath: | ||
| path: / | ||
| name: root | ||
| sonobuoy-config: | ||
| driver: DaemonSet | ||
| plugin-name: systemd-logs | ||
| result-format: raw | ||
| spec: | ||
| command: | ||
| - /bin/sh | ||
| - -c | ||
| - /get_systemd_logs.sh; while true; do echo "Plugin is complete. Sleeping indefinitely | ||
| to avoid container exit and automatic restarts from Kubernetes"; sleep 3600; done | ||
| env: | ||
| - name: CHROOT_DIR | ||
| value: /node | ||
| - name: NODE_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| - name: RESULTS_DIR | ||
| value: /tmp/sonobuoy/results | ||
| - name: SONOBUOY | ||
| value: "true" | ||
| - name: SONOBUOY_CONFIG_DIR | ||
| value: /tmp/sonobuoy/config | ||
| - name: SONOBUOY_K8S_VERSION | ||
| value: ignore | ||
| - name: SONOBUOY_PROGRESS_PORT | ||
| value: "8099" | ||
| - name: SONOBUOY_RESULTS_DIR | ||
| value: /tmp/sonobuoy/results | ||
| image: sonobuoy/systemd-logs:v0.4 | ||
| imagePullPolicy: IfNotPresent | ||
| name: systemd-logs | ||
| securityContext: | ||
| privileged: true | ||
| volumeMounts: | ||
| - mountPath: /node | ||
| name: root | ||
| - mountPath: /tmp/sonobuoy/results | ||
| name: results | ||
| kind: ConfigMap | ||
| metadata: | ||
| labels: | ||
| component: sonobuoy | ||
| name: sonobuoy-plugins-cm | ||
| namespace: sonobuoy | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| labels: | ||
| component: sonobuoy | ||
| sonobuoy-component: aggregator | ||
| tier: analysis | ||
| name: sonobuoy | ||
| namespace: sonobuoy | ||
| spec: | ||
| containers: | ||
| - args: | ||
| - aggregator | ||
| - --no-exit | ||
| - --level=info | ||
| - -v=4 | ||
| - --alsologtostderr | ||
| command: | ||
| - /sonobuoy | ||
| env: | ||
| - name: FOO | ||
| value: bar | ||
| - name: SONOBUOY_ADVERTISE_IP | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: status.podIP | ||
| image: sonobuoy/sonobuoy:*STATIC_FOR_TESTING* | ||
| imagePullPolicy: IfNotPresent | ||
| name: kube-sonobuoy | ||
| volumeMounts: | ||
| - mountPath: /etc/sonobuoy | ||
| name: sonobuoy-config-volume | ||
| - mountPath: /plugins.d | ||
| name: sonobuoy-plugins-volume | ||
| - mountPath: /tmp/sonobuoy | ||
| name: output-volume | ||
| restartPolicy: Never | ||
| securityContext: | ||
| fsGroup: 2000 | ||
| runAsGroup: 3000 | ||
| runAsUser: 1000 | ||
| serviceAccountName: sonobuoy-serviceaccount | ||
| tolerations: | ||
| - key: kubernetes.io/e2e-evict-taint-key | ||
| operator: Exists | ||
| volumes: | ||
| - configMap: | ||
| name: sonobuoy-config-cm | ||
| name: sonobuoy-config-volume | ||
| - configMap: | ||
| name: sonobuoy-plugins-cm | ||
| name: sonobuoy-plugins-volume | ||
| - emptyDir: {} | ||
| name: output-volume | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| labels: | ||
| component: sonobuoy | ||
| sonobuoy-component: aggregator | ||
| name: sonobuoy-aggregator | ||
| namespace: sonobuoy | ||
| spec: | ||
| ports: | ||
| - port: 8080 | ||
| protocol: TCP | ||
| targetPort: 8080 | ||
| selector: | ||
| sonobuoy-component: aggregator | ||
| type: ClusterIP | ||
| --- | ||
|
|