Skip to content

Commit 2a66705

Browse files
committed
added precommit for trailing-whitespace
1 parent ea5f40a commit 2a66705

File tree

60 files changed

+115
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+115
-115
lines changed

.github/actions/setup-kind-cluster-for-helm-chart-testing/action.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
description: helm version to install
77
required: true
88
default: 'v3.16.3'
9-
9+
1010
# renovate: datasource=github-tags depName=python/cpython
1111
python-version:
1212
description: python version to install
@@ -36,7 +36,7 @@ inputs:
3636
required: false
3737
default: 'registryuser1'
3838

39-
local-registry-password:
39+
local-registry-password:
4040
description: local authenticated registry password
4141
required: false
4242
default: 'registrypassword1'
@@ -70,7 +70,7 @@ runs:
7070
version: ${{ inputs.kind-version }}
7171
config: _test/kind-config.yaml
7272

73-
# for helm charts we are testing that require installing operators
73+
# for helm charts we are testing that require installing operators
7474
- name: Setup kind cluster - Install OLM 🧰
7575
env:
7676
OLM_VERSION: ${{ inputs.olm-version }}
@@ -121,7 +121,7 @@ runs:
121121
--set registryPassword=${LOCAL_REGISTRY_PASSWORD} \
122122
--set registryIngressHost=${LOCAL_REGISTRY_URI}
123123
if: inputs.local-registry-enabled == 'true'
124-
124+
125125
# copy images needed by CT tests that use private registry to the private registry
126126
- name: Setup kind cluster - Copy images into private registry 🔺
127127
env:

.github/workflows/conftest.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Validate
22

3-
on:
3+
on:
44
push:
55
paths-ignore:
66
- '.github/**'

.github/workflows/install-integration-tests-operators-installer.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3030
with:
3131
fetch-depth: 0
32-
32+
3333
# set up kind cluster (using re-usable local composite action)
3434
- name: Setup Kind Cluster for Helm Chart Testing 🧰
3535
uses: ./.github/actions/setup-kind-cluster-for-helm-chart-testing
@@ -93,7 +93,7 @@ jobs:
9393
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
9494
with:
9595
fetch-depth: 0
96-
96+
9797
# set up kind cluster (using re-usable local composite action)
9898
- name: Setup Kind Cluster for Helm Chart Testing 🧰
9999
uses: ./.github/actions/setup-kind-cluster-for-helm-chart-testing

.github/workflows/install-unit-test.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
fetch-depth: 0
2626

2727
- name: Setup chart-testing 🧰
28-
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
29-
28+
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
29+
3030
- name: Find changed Charts 🔎
3131
id: changed-charts
3232
run: |
@@ -35,7 +35,7 @@ jobs:
3535
if [[ -n "$changed" ]]; then
3636
echo "changed=true" >> $GITHUB_OUTPUT
3737
fi
38-
38+
3939
# set up kind cluster (using re-usable local composite action)
4040
- name: Setup Kind Cluster for Helm Chart Testing 🧰
4141
uses: ./.github/actions/setup-kind-cluster-for-helm-chart-testing

.github/workflows/lint-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Lint Test
22

3-
on:
3+
on:
44
pull_request:
55
paths-ignore:
66
- '.github/**'

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
for chart in ${packaged_charts}; do
5959
cosign sign-blob --yes ${chart}
6060
done
61-
61+
6262
echo "hashes=$(sha256sum ${packaged_charts} | base64 -w0)" >> "$GITHUB_OUTPUT"
6363
6464
outputs:

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: check-shebang-scripts-are-executable
77
- id: check-json
88
- id: end-of-file-fixer
9-
#- id: trailing-whitespace
9+
- id: trailing-whitespace
1010
- repo: https://gitlab.cee.redhat.com/infosec-public/developer-workbench/tools.git
1111
rev: rh-pre-commit-2.3.2
1212
hooks:

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ helm install my-jenkins -f my-values.yaml redhat-cop/jenkins
4242

4343
## 🏃‍♂️💨 Chart linting
4444

45-
Before adding a chart to this repo, make sure there is no linting issues, otherwise the PR actions will fail.
45+
Before adding a chart to this repo, make sure there is no linting issues, otherwise the PR actions will fail.
4646
We use both the integrated [`helm lint`](https://helm.sh/docs/helm/helm_lint/) command and the [`chart testing`](https://github.com/helm/chart-testing/blob/master/doc/ct_lint.md) tool.
4747

4848
```bash

charts-we-like.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Below is a collection of charts we've used in the past that run on OpenShift with examples and the values to get up and going:
33

44
#### 🕵️‍♀️ Sealed Secrets
5-
[Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets/tree/main/helm/sealed-secrets)
5+
[Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets/tree/main/helm/sealed-secrets)
66
allows you to encrypt your K8s Secret into a SealedSecret, which is safe to store - even to a public repository:
77

88
```yaml
@@ -31,7 +31,7 @@ mysql:
3131
```
3232
3333
#### 🧪 Zalenium
34-
[Zalenium](https://github.com/zalando/zalenium/tree/master/charts/zalenium)
34+
[Zalenium](https://github.com/zalando/zalenium/tree/master/charts/zalenium)
3535
is a Selenium Grid deployment with on demand provisioning of the browsers for running your tests:
3636
3737
```yaml
@@ -71,7 +71,7 @@ route:
7171
```
7272
7373
#### 🦟 Hoverfly
74-
[Hoverfly](https://github.com/helm/charts/tree/master/incubator/hoverfly)
74+
[Hoverfly](https://github.com/helm/charts/tree/master/incubator/hoverfly)
7575
is a lightweight, open source API simulation tool. Using Hoverfly, you can create realistic simulations of the APIs your application depends on:
7676
7777
```yaml
@@ -87,7 +87,7 @@ openshift:
8787
```
8888
8989
#### 🗝 Vault
90-
[Vault](https://github.com/hashicorp/vault-helm.git)
90+
[Vault](https://github.com/hashicorp/vault-helm.git)
9191
helps you to store and control access to your tokens, passwords, certificates, API keys and other secrets.
9292
9393
```yaml
@@ -121,7 +121,7 @@ server:
121121
```
122122
123123
### 🚉 EAP
124-
[EAP](https://github.com/jbossas/eap-charts.git)
124+
[EAP](https://github.com/jbossas/eap-charts.git)
125125
is Red Hat's [Jakarta EE offering](https://www.redhat.com/en/technologies/jboss-middleware/application-platform)
126126
127127
```yaml

charts/ansible-automation-platform/templates/wait-for-crd.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
apiVersion: v1
44
kind: Pod
55
metadata:
6-
name: cluster-check
6+
name: cluster-check
77
annotations:
88
"helm.sh/hook": post-install,post-upgrade
99
"helm.sh/hook-weight": "-1"
1010
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
1111
namespace: {{ .Values.namespace }}
1212
spec:
1313
containers:
14-
- name: crd-check
14+
- name: crd-check
1515
image: quay.io/openshift/origin-cli:4.7
1616
imagePullPolicy: IfNotPresent
1717
command: ['sh', '-c', 'while [ true ]; do oc get crd automationcontrollers.automationcontroller.ansible.com; if [ $? -eq 0 ]; then break; fi ; sleep 5s; done']

charts/bootstrap-project/templates/operatorgroup.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: {{ .name }}-og
99
namespace: {{ .name | quote }}
1010
spec:
11-
targetNamespaces:
11+
targetNamespaces:
1212
- {{ .name }}
1313
{{- end }}
1414
{{- end }}

charts/cert-manager-configs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ While the cert-manager install can be done with mostly default values, these con
3737
```bash
3838
helm template cert-manager-configs -f charts/cert-manager-configs/values.yaml ./charts/cert-manager-configs | oc apply -f -
3939
```
40-
40+
4141
### Configuration
4242

4343
See comments in [values.yaml](./values.yaml) for more details on configuration

charts/dev-ex-dashboard/templates/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
annotations:
88
argocd.argoproj.io/compare-options: IgnoreExtraneous
99
argocd.argoproj.io/sync-options: Prune=false
10-
data:
10+
data:
1111
conf: |
1212
{{- .Values.config | toYaml | nindent 4 }}
1313
{{- end }}

charts/dev-ex-dashboard/templates/deploymentconfig.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ spec:
6868
name: {{ .Values.app_name }}:{{ .Values.deployment.image.tag }}
6969
lastTriggeredImage: ""
7070
type: ImageChange
71-
- type: ConfigChange
71+
- type: ConfigChange

charts/dev-ex-dashboard/templates/imagestream.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: image.openshift.io/v1
33
kind: ImageStream
44
metadata:
5-
creationTimestamp: null
5+
creationTimestamp: null
66
labels:
77
app: {{ .Values.app_name }}
88
name: {{ .Values.app_name }}

charts/gitops-operator/TEAM_DOCS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ We use a helm chart that deploys:
370370
Everyone will need to be given `edit` access to the `openshift-gitops` namespace e.g. as a `cluster-admin` user:
371371

372372
```bash
373-
# allow labs-admin group edit access to
373+
# allow labs-admin group edit access to
374374
oc adm policy add-role-to-group edit labs-admins -n openshift-gitops
375375
```
376376

charts/gitops-operator/templates/wait-for-crd.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
apiVersion: v1
44
kind: Pod
55
metadata:
6-
name: cluster-check
6+
name: cluster-check
77
annotations:
88
"helm.sh/hook": post-install,post-upgrade
99
"helm.sh/hook-weight": "-1"
1010
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
1111
namespace: {{ .Release.Namespace }}
1212
spec:
1313
containers:
14-
- name: crd-check
14+
- name: crd-check
1515
image: quay.io/openshift/origin-cli:latest
1616
imagePullPolicy: IfNotPresent
1717
command: ['sh', '-c', 'while [ true ]; do oc get crd argocds.argoproj.io applications.argoproj.io appprojects.argoproj.io; if [ $? -eq 0 ]; then break; fi ; sleep 5s; done']

charts/helper-operator/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
![Version: 1.0.26](https://img.shields.io/badge/Version-1.0.26-informational?style=flat-square)
88

9-
9+
1010

1111
## Description
1212

charts/helper-operator/README.md.gotmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{ template "doc.header" . }}
22

3-
This chart can be used to install Operators in OpenShift.
3+
This chart can be used to install Operators in OpenShift.
44
It is best used with a GitOps approach such as Argo CD does. For example: https://github.com/tjungbauer/openshift-clusterconfig-gitops
55

66
This chart will create the objects: Namespace, Subscription, OperatorGroup and a Job, that will enable additional console plugins, if enabled.

charts/helper-status-checker/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
![Version: 4.0.9](https://img.shields.io/badge/Version-4.0.9-informational?style=flat-square)
88

9-
9+
1010

1111
## Description
1212

charts/helper-status-checker/README.md.gotmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{{ template "doc.header" . }}
22

3-
This chart is used the check the installation status of an Operator.
3+
This chart is used the check the installation status of an Operator.
44
Whenever a new Operator gets installed, this Chart can be called to verify if the status of the Operator is ready.
55
This is useful when you want to install an Operator AND configure it in the same Helm Chart. Typically, Argo CD will fail in such case,
66
because it would try to configure the CRD that the Operator provides immediately after the Subscription object becomes ready. However,
77
the CRD is not available yet, since the Operator is still installing itself.
88

99
It is best used as a Subchart, for example, https://github.com/tjungbauer/helm-charts/tree/main/charts/rhacm-full-stack
1010

11-
helper-status-checker will create a Service Account (incl. a ClusterRole and a ClusterRoleBinding) and a Job that will try to check the status of the Operator. If the Operator is not available after some time (configurable with mx_retries), the Job will fail.
11+
helper-status-checker will create a Service Account (incl. a ClusterRole and a ClusterRoleBinding) and a Job that will try to check the status of the Operator. If the Operator is not available after some time (configurable with mx_retries), the Job will fail.
1212

1313
NOTE: This chart can also be used to automatically approve an InstallPlan
1414

charts/helper-status-checker/templates/check_if_operator_is_ready.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ spec:
115115
oc get clusterserviceversion -n {{ .namespace.name }} $get_exact_name
116116
117117
echo "Falling to sleep"
118-
118+
119119
SLEEPER_TMP=0
120120
121121
while [[ $SLEEPER_TMP -le "10" ]]; do

charts/helper-status-checker/templates/installplan-approver.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
2929
SLEEPER_TMP=1
3030
SLEEPER_MOD=10
31-
while [[ $SLEEPER_TMP -le "$sleep_timer" ]]; do
31+
while [[ $SLEEPER_TMP -le "$sleep_timer" ]]; do
3232
if (( $SLEEPER_TMP % 10 == 0 ))
3333
then
3434
echo -n "$SLEEPER_MOD"

charts/ipa/setup-users.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ oc rsh `oc get po -l deploymentconfig=${IPA_RELEASE_NAME}-ipa -o name -n ${IPA_N
1212
echo 'Passw0rd' | kinit admin
1313
export GROUP_NAME=student
1414
ipa group-add ${GROUP_NAME} --desc "TL500 Other" || true
15-
# in a loop add random users to the group
15+
# in a loop add random users to the group
1616
for i in {1..24};do
1717
export LAB_NUMBER="lab$i"
1818
printf "\n\nI is user login ${LAB_NUMBER}"
1919
PASSWD=$(ipa user-add ${LAB_NUMBER} --first=${LAB_NUMBER} --last=${LAB_NUMBER} --email=${LAB_NUMBER}@redhatlabs.dev --random | grep Random)
20-
printf "My creds are ${PASSWD}\n\n"
20+
printf "My creds are ${PASSWD}\n\n"
2121
ipa group-add-member ${GROUP_NAME} --users=$LAB_NUMBER
2222
done
2323

@@ -26,7 +26,7 @@ done
2626
# alternative setup - provide silly passwords for users
2727
export GROUP_NAME=student
2828
ipa group-add ${GROUP_NAME} --desc "TL500 Student Group" || true
29-
# in a loop add random users to the group
29+
# in a loop add random users to the group
3030
for i in {1..4};do
3131
export LAB_NUMBER="lab$i"
3232
echo 'thisisthepassword' | ipa user-add ${LAB_NUMBER} --first=${LAB_NUMBER} --last=${LAB_NUMBER} --email=${LAB_NUMBER}@redhatlabs.dev --password

charts/jenkins/templates/buildconfigs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
contextDir: {{ .source_context_dir | quote }}
4141
{{- else }}
4242
contextDir: "jenkins-agents/{{ .name }}"
43-
{{- end }}
43+
{{- end }}
4444
strategy:
4545
{{- if .strategy_type }}
4646
type: {{ .strategy_type }}

charts/jenkins/templates/deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if .Values.deployment }}
22
---
3-
apiVersion: apps/v1
3+
apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
annotations:
@@ -14,7 +14,7 @@ spec:
1414
matchLabels:
1515
app.kubernetes.io/name: {{ .Values.appName }}
1616
strategy: {{- if .Values.persistence }}
17-
type: Recreate
17+
type: Recreate
1818
{{ else }}
1919
type: RollingUpdate
2020
{{- end }}
@@ -29,7 +29,7 @@ spec:
2929
- name: OPENSHIFT_ENABLE_OAUTH
3030
value: "true"
3131
- name: OPENSHIFT_ENABLE_REDIRECT_PROMPT
32-
value: "true"
32+
value: "true"
3333
{{- end }}
3434
- name: KUBERNETES_MASTER
3535
value: https://kubernetes.default:443

charts/network-policy/templates/NetworkPolicy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- if .Values.enabled }}
22
{{ $labels := include "network-policy.labels" . }}
33
{{ $all_policies := .Values.policies }}
4-
{{ if ne 0 (len .Values.multitenant_policies) }}
4+
{{ if ne 0 (len .Values.multitenant_policies) }}
55
{{ $all_policies = concat .Values.policies .Values.multitenant_policies }}
66
{{ end }}
77
{{- range $all_policies }}
@@ -13,7 +13,7 @@ metadata:
1313
labels:
1414
{{- $labels | nindent 4 }}
1515
name: {{ .name }}
16-
spec:
16+
spec:
1717
{{ toYaml .spec | indent 2 }}
1818
{{ end }}
1919
{{ end }}

charts/operatorhub/templates/install-modes-post-hook.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
command:
6161
- /bin/bash
6262
- -c
63-
- | #TODO: Get the CSV from the cluster instead from a var?
63+
- | #TODO: Get the CSV from the cluster instead from a var?
6464
oc -n {{ $op.namespace }} patch csv {{ $op.subscription.csv }} --type=merge -p '{"spec":{"installModes":[{"supported": {{ $im.OwnNamespace }}, "type":"OwnNamespace"},{"supported": {{ $im.SingleNamespace }}, "type":"SingleNamespace"},{"supported": {{ $im.MultiNamespace }}, "type":"MultiNamespace"},{"supported": {{ $im.AllNamespaces }}, "type":"AllNamespaces"}]}}'
6565
{{- end }}
6666
{{- end }}

0 commit comments

Comments
 (0)