Skip to content

Commit

Permalink
added pre-commit for end-of-file-fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
garethahealy committed Feb 13, 2025
1 parent 28075ce commit 75f3979
Show file tree
Hide file tree
Showing 121 changed files with 110 additions and 125 deletions.
2 changes: 1 addition & 1 deletion .github/renovate-bump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ for chart in ${changed}; do
echo
done

echo "CHARTS=$(echo ${CHARTS_CHANGED[*]})" >> $GITHUB_OUTPUT
echo "CHARTS=$(echo ${CHARTS_CHANGED[*]})" >> $GITHUB_OUTPUT
2 changes: 1 addition & 1 deletion .gitleaks.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ description = "Global Allowlist"
paths = [
# Ignore all example certs
'renovate.json'
]
]
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: check-case-conflict
- id: check-shebang-scripts-are-executable
- id: check-json
#- id: end-of-file-fixer
- id: end-of-file-fixer
#- id: trailing-whitespace
- repo: https://gitlab.cee.redhat.com/infosec-public/developer-workbench/tools.git
rev: rh-pre-commit-2.3.2
Expand Down
2 changes: 1 addition & 1 deletion _test/bats-support-clone.bash
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ fi
if [[ ! -d "_test/test_helper/redhatcop-bats-library" ]]; then
# Download redhat-cop/bats-library dynamically so it doesnt need to be added into source
git clone https://github.com/redhat-cop/bats-library _test/test_helper/redhatcop-bats-library --depth 1
fi
fi
1 change: 0 additions & 1 deletion _test/private-registry/templates/Ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ spec:
name: registry
port:
number: 5000

1 change: 0 additions & 1 deletion _test/private-registry/templates/Secret_htpasswd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ kind: Secret
metadata:
name: htpasswd
namespace: registry

2 changes: 1 addition & 1 deletion _test/prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ run() {
echo "Done testing all charts."
}

run
run
2 changes: 1 addition & 1 deletion charts-we-like.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,4 @@ build:
value: '-XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m'
deploy:
replicas: 3
```
```
2 changes: 1 addition & 1 deletion charts/ansible-automation-platform/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
.project
.idea/
*.tmproj
ci/
ci/
2 changes: 1 addition & 1 deletion charts/ansible-automation-platform/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ subjects:
- kind: ServiceAccount
name: ansible-automation-platform
namespace: {{ .Values.namespace }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/argocd-operator/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
.project
.idea/
*.tmproj
ci/
ci/
2 changes: 1 addition & 1 deletion charts/argocd-operator/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ spec:
source: community-operators
sourceNamespace: openshift-marketplace
startingCSV: {{ .Values.metrics.prometheus.version | quote }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/argocd-operator/templates/Secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ stringData:
username: {{ .username | quote }}
sshPrivateKey: {{ .sshPrivateKey | quote }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/argocd-operator/templates/crd-reader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ subjects:
- kind: ServiceAccount
name: default
namespace: {{ include "argocd-operator.ns" . }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/argocd-operator/templates/helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Namespace from Values or Release Name
{{- else -}}
{{- .Release.Namespace | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/argocd-operator/templates/wait-for-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ spec:
terminationGracePeriodSeconds: 0
serviceAccount: default
serviceAccountName: default
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/bootstrap-project/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
2 changes: 1 addition & 1 deletion charts/bootstrap-project/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ These values currently create `labs-ci-cd` , `labs-dev` and `labs-test` namespac

```bash
$ helm template -f bootstrap-project/my-values.yaml bootstrap-project | oc apply -f-
```
```
2 changes: 1 addition & 1 deletion charts/bootstrap-project/templates/bindings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ items:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/bootstrap-project/templates/operatorgroup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ spec:
- {{ .name }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
1 change: 0 additions & 1 deletion charts/cert-manager-configs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ See comments in [values.yaml](./values.yaml) for more details on configuration
| `cluster.apiServer.tlsSecret` | APIServer secret name created in `certificates.apiServer.name` | `api-letsencrypt-cert` |
| `cluster.ingressController.enabled` | Enable ACME wildcard IngressController certificates | `false` |
| `cluster.caBundle` | Get latest Let's Encrypt CA and drop it here | `''` |

1 change: 0 additions & 1 deletion charts/cert-manager-configs/templates/Certificate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ spec:
{{- end }}
{{- end }}
{{- end }}

2 changes: 1 addition & 1 deletion charts/dev-ex-dashboard/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
2 changes: 1 addition & 1 deletion charts/etherpad/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
2 changes: 1 addition & 1 deletion charts/etherpad/templates/route.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ status:
- conditions:
- status: 'True'
type: Admitted
{{ end }}
{{ end }}
2 changes: 1 addition & 1 deletion charts/gitops-operator/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
.project
.idea/
*.tmproj
ci/
ci/
2 changes: 1 addition & 1 deletion charts/gitops-operator/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ rules:
apiGroups:
- compliance.openshift.io
resources:
- scansettingbindings
- scansettingbindings
2 changes: 1 addition & 1 deletion charts/gitops-operator/docs/server-cluster-rbac-rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ rules:
apiGroups:
- ''
resources:
- events
- events
2 changes: 1 addition & 1 deletion charts/gitops-operator/templates/crd-reader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ subjects:
- kind: ServiceAccount
name: default
namespace: {{ .Release.Namespace }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/gitops-operator/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ stringData:
sshPrivateKey: {{ $secret.sshPrivateKey | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/helper-console-links/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
2 changes: 1 addition & 1 deletion charts/helper-console-links/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ This a reusable template to avoid code repetition in other charts. To use this c

The result is the Link in Application menu. This allows development teams, who do not have admin permissions (and cannot access certains namespaces to check the exact Route ) to quickly access the global tools (like argocd, gitlab, jenkins, grafana etc.)

![console link](img/screenshot.png)
![console link](img/screenshot.png)
2 changes: 1 addition & 1 deletion charts/helper-operator/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
1 change: 0 additions & 1 deletion charts/helper-operator/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ Selector labels
app.kubernetes.io/name: {{ include "common.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

2 changes: 1 addition & 1 deletion charts/helper-sealed-secrets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ kubectl create secret generic example-opaque --dry-run --from-literal=foo=bar -o
--controller-name=sealed-secrets \
--controller-namespace=labs-ci-cd \
--format yaml > sealed-example-opaque.yaml
```
```
2 changes: 1 addition & 1 deletion charts/helper-status-checker/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
2 changes: 1 addition & 1 deletion charts/helper-status-checker/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ rules:
- patch
{{- end }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/ipa/templates/configure-oauth-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ metadata:
"helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-weight": "1"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/ipa/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ spec:
periodSeconds: 10
successThreshold: 1
failureThreshold: 3
initialDelaySeconds: 60
initialDelaySeconds: 60
2 changes: 1 addition & 1 deletion charts/ipa/templates/machineconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ spec:
WantedBy=multi-user.target
enabled: true
name: sebool.service
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/ipa/templates/setup-oauth-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ spec:
serviceAccount: config-oauth
serviceAccountName: config-oauth
terminationGracePeriodSeconds: 10
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/jenkins/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
.project
.idea/
*.tmproj
ci/
ci/
2 changes: 1 addition & 1 deletion charts/jenkins/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
2 changes: 1 addition & 1 deletion charts/jenkins/templates/buildconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ spec:
kind: ImageStreamTag
name: "{{ .name }}:latest"
{{- end}}
{{- end}}
{{- end}}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ metadata:
data:
JCasC.yaml: |
{{- .Values.configAsCode.body | nindent 4 }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/jenkins/templates/imagestreams.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ spec:
referencePolicy:
type: Source
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/jenkins/templates/route.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ status:
- conditions:
- status: 'True'
type: Admitted
{{ end }}
{{ end }}
2 changes: 1 addition & 1 deletion charts/jenkins/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ stringData:
password: {{ .password | quote }}
username: {{ .username | quote }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/jenkins/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ kind: ServiceAccount
metadata:
annotations:
serviceaccounts.openshift.io/oauth-redirectreference.jenkins: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"{{ .Values.appName }}"}}'
name: {{ .Values.appName }}
name: {{ .Values.appName }}
2 changes: 1 addition & 1 deletion charts/network-policy/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ case $1 in
*)
echo "Not an option"
exit 1
esac
esac
2 changes: 1 addition & 1 deletion charts/network-policy/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ Selector labels
{{- define "network-policy.selectorLabels" -}}
app.kubernetes.io/name: {{ include "network-policy.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ Return the protocol for Fluentd forwarding
{{- else -}}
{{- print "tcp" -}}
{{- end -}}
{{- end -}}
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ spec:
- {{ $fullName }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/component: fluentd
{{ include "openshift-logforwarding-splunk.labels" . | indent 4 }}
{{ include "openshift-logforwarding-splunk.labels" . | indent 4 }}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ data:
{{ $logForwardingCertificateName }}.crt: {{ $fluentdCaFile | b64enc }}
{{ $logForwardingCertificateName }}.key: {{ $fluentdKeyFile | b64enc }}
ca-bundle.crt: {{ $fluentdCaFile | b64enc }}
{{ end }}
{{ end }}
Loading

0 comments on commit 75f3979

Please sign in to comment.