Skip to content

Fix go templates that broke during megalinter autofix #1430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J12934 merged 3 commits into from
Nov 2, 2022
Merged

Fix go templates that broke during megalinter autofix #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fb3915
Disable linting of tempalte yaml files
the-simmon Nov 2, 2022
87058c9
Fix megalint autofix changes
the-simmon Nov 2, 2022
f0e5614
Fix megalinter config regex
the-simmon Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mega-linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ SHOW_ELAPSED_TIME: true
DISABLE_ERRORS: true # Uncomment if you want MegaLinter to detect errors but not block CI to pass

# ignore files generated by controller-gen
FILTER_REGEX_EXCLUDE: (.*rbac/role\.yaml|.*bases/.*\.yaml)
FILTER_REGEX_EXCLUDE: (.*rbac/role\.yaml|.*bases/.*\.yaml|.*/templates/.*\.yaml)
VALIDATE_ALL_CODEBASE: false
IGNORE_GENERATED_FILES: true

Expand Down
9 changes: 6 additions & 3 deletions demo-targets/bodgeit/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "bodgeit.fullname" .}}
labels: {{- include "bodgeit.labels" . | nindent 4}}
annotations: {{- include "bodgeit.annotations" . | nindent 4}}
labels:
{{- include "bodgeit.labels" . | nindent 4}}
annotations:
{{- include "bodgeit.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "bodgeit.selectorLabels" . | nindent 4}}
selector:
{{- include "bodgeit.selectorLabels" . | nindent 4}}
9 changes: 6 additions & 3 deletions demo-targets/dummy-ssh/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "dummy-ssh.fullname" .}}
labels: {{- include "dummy-ssh.labels" . | nindent 4}}
annotations: {{- include "dummy-ssh.annotations" . | nindent 4}}
labels:
{{- include "dummy-ssh.labels" . | nindent 4}}
annotations:
{{- include "dummy-ssh.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: ssh
protocol: TCP
name: ssh
selector: {{- include "dummy-ssh.selectorLabels" . | nindent 4}}
selector:
{{- include "dummy-ssh.selectorLabels" . | nindent 4}}
9 changes: 6 additions & 3 deletions demo-targets/http-webhook/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "http-webhook.fullname" .}}
labels: {{- include "http-webhook.labels" . | nindent 4}}
annotations: {{- include "http-webhook.annotations" . | nindent 4}}
labels:
{{- include "http-webhook.labels" . | nindent 4}}
annotations:
{{- include "http-webhook.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "http-webhook.selectorLabels" . | nindent 4}}
selector:
{{- include "http-webhook.selectorLabels" . | nindent 4}}
9 changes: 6 additions & 3 deletions demo-targets/juice-shop/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "juice-shop.fullname" .}}
labels: {{- include "juice-shop.labels" . | nindent 4}}
annotations: {{- include "juice-shop.annotations" . | nindent 4}}
labels:
{{- include "juice-shop.labels" . | nindent 4}}
annotations:
{{- include "juice-shop.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "juice-shop.selectorLabels" . | nindent 4}}
selector:
{{- include "juice-shop.selectorLabels" . | nindent 4}}
6 changes: 4 additions & 2 deletions demo-targets/old-joomla/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "old-joomla.fullname" .}}
labels: {{- include "old-joomla.labels" . | nindent 4}}
labels:
{{- include "old-joomla.labels" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "old-joomla.selectorLabels" . | nindent 4}}
selector:
{{- include "old-joomla.selectorLabels" . | nindent 4}}
6 changes: 4 additions & 2 deletions demo-targets/old-typo3/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "old-typo3.fullname" .}}
labels: {{- include "old-typo3.labels" . | nindent 4}}
labels:
{{- include "old-typo3.labels" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "old-typo3.selectorLabels" . | nindent 4}}
selector:
{{- include "old-typo3.selectorLabels" . | nindent 4}}
9 changes: 6 additions & 3 deletions demo-targets/old-wordpress/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "old-wordpress.fullname" .}}
labels: {{- include "old-wordpress.labels" . | nindent 4}}
annotations: {{- include "old-wordpress.annotations" . | nindent 4}}
labels:
{{- include "old-wordpress.labels" . | nindent 4}}
annotations:
{{- include "old-wordpress.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "old-wordpress.selectorLabels" . | nindent 4}}
selector:
{{- include "old-wordpress.selectorLabels" . | nindent 4}}
9 changes: 6 additions & 3 deletions demo-targets/swagger-petstore/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "swagger-petstore.fullname" .}}
labels: {{- include "swagger-petstore.labels" . | nindent 4}}
annotations: {{- include "swagger-petstore.annotations" . | nindent 4}}
labels:
{{- include "swagger-petstore.labels" . | nindent 4}}
annotations:
{{- include "swagger-petstore.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "swagger-petstore.selectorLabels" . | nindent 4}}
selector:
{{- include "swagger-petstore.selectorLabels" . | nindent 4}}
9 changes: 6 additions & 3 deletions demo-targets/unsafe-https/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "unsafe-https.fullname" .}}
labels: {{- include "unsafe-https.labels" . | nindent 4}}
annotations: {{- include "unsafe-https.annotations" . | nindent 4}}
labels:
{{- include "unsafe-https.labels" . | nindent 4}}
annotations:
{{- include "unsafe-https.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: https
protocol: TCP
name: https
selector: {{- include "unsafe-https.selectorLabels" . | nindent 4}}
selector:
{{- include "unsafe-https.selectorLabels" . | nindent 4}}
9 changes: 6 additions & 3 deletions demo-targets/vulnerable-log4j/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "vulnerable-log4j.fullname" .}}
labels: {{- include "vulnerable-log4j.labels" . | nindent 4}}
annotations: {{- include "vulnerable-log4j.annotations" . | nindent 4}}
labels:
{{- include "vulnerable-log4j.labels" . | nindent 4}}
annotations:
{{- include "vulnerable-log4j.annotations" . | nindent 4}}
spec:
type: {{.Values.service.type}}
ports:
- port: {{.Values.service.port}}
targetPort: http
protocol: TCP
name: http
selector: {{- include "vulnerable-log4j.selectorLabels" . | nindent 4}}
selector:
{{- include "vulnerable-log4j.selectorLabels" . | nindent 4}}
3 changes: 2 additions & 1 deletion hooks/notification/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: "{{ .Release.Name }}-config"
labels: {{- include "notification-hook.labels" . | nindent 4}}
labels:
{{- include "notification-hook.labels" . | nindent 4}}
data:
notification-channel.yaml: |
{{ .Values.notificationChannels | toYaml | nindent 4 }}
1 change: 0 additions & 1 deletion operator/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down