Skip to content

Commit 4070e37

Browse files
committed
Reformat YAML code
1 parent 847d37e commit 4070e37

72 files changed

Lines changed: 1227 additions & 762 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ root = true
44
end_of_line = lf
55
trim_trailing_whitespace = true
66
insert_final_newline = true
7+
8+
[*.kt]
79
ij_kotlin_call_parameters_new_line_after_left_paren = false
810
ij_kotlin_call_parameters_right_paren_on_new_line = false
911
ij_kotlin_method_parameters_new_line_after_left_paren = false
@@ -12,16 +14,19 @@ ij_any_wrap_long_lines = false
1214
ij_formatter_off_tag = "@formatter:off"
1315
ij_formatter_on_tag = "@formatter:on"
1416
max_line_length = 256
15-
16-
[*.{java,xml,yaml}]
1717
indent_style = space
1818
indent_size = 4
1919
charset = utf-8
2020

21+
[*yaml]
22+
indent_style = space
23+
indent_size = 2
24+
charset = utf-8
25+
2126
[*.gradle]
2227
indent_style = tab
2328

24-
[Jenkinsfile}]
29+
[Jenkinsfile]
2530
indent_style = space
2631
indent_size = 4
2732
charset = utf-8

docs/deployment/bases/clustered/operator/crd.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
scope: "Namespaced"
1212
version: "v1alpha1"
1313
subresources:
14-
status: {}
14+
status: { }
1515
validation:
1616
openAPIV3Schema:
1717
description: ShinyProxy
@@ -33,7 +33,7 @@ spec:
3333
name:
3434
type: string
3535
required:
36-
- name
36+
- name
3737
spec:
3838
description: Specification of the ShinyProxy (i.e. application.yml)
3939
type: object
@@ -62,14 +62,14 @@ spec:
6262
authentication:
6363
type: string
6464
enum:
65-
- ldap
66-
- kerberos
67-
- keycloak
68-
- openid
69-
- saml
70-
- social
71-
- simple
72-
- none
65+
- ldap
66+
- kerberos
67+
- keycloak
68+
- openid
69+
- saml
70+
- social
71+
- simple
72+
- none
7373
containerWaitTime:
7474
type: integer
7575
hideNavbar:
@@ -122,8 +122,8 @@ spec:
122122
appNamespaces:
123123
type: array
124124
required:
125-
- proxy
126-
- fqdn
125+
- proxy
126+
- fqdn
127127
status:
128128
description: ShinyProxyStatus defines the observed state of ShinyProxy
129129
type: object
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- crd.yaml
5-
- deployment.yaml
6-
- serviceaccount.yaml
4+
- crd.yaml
5+
- deployment.yaml
6+
- serviceaccount.yaml

docs/deployment/bases/clustered/operator/serviceaccount.yaml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@ apiVersion: rbac.authorization.k8s.io/v1
88
metadata:
99
name: shinyproxy-operator-role
1010
rules:
11-
- apiGroups: [""]
12-
resources: ["pods"]
13-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
14-
- apiGroups: ["networking.k8s.io"]
15-
resources: ["ingresses"]
16-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
17-
- apiGroups: [""]
18-
resources: ["services"]
19-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
20-
- apiGroups: ["openanalytics.eu"]
21-
resources: ["shinyproxies", "shinyproxies/status"]
22-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
23-
- apiGroups: [""]
24-
resources: ["customresource"]
25-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
26-
- apiGroups: [""]
27-
resources: ["configmaps"]
28-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
29-
- apiGroups: ["apiextensions.k8s.io"]
30-
resources: ["customresourcedefinitions"]
31-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
32-
- apiGroups: ["apps"]
33-
resources: ["replicasets"]
34-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
35-
- apiGroups: ["extensions"]
36-
resources: ["replicasets"]
37-
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
11+
- apiGroups: [ "" ]
12+
resources: [ "pods" ]
13+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
14+
- apiGroups: [ "networking.k8s.io" ]
15+
resources: [ "ingresses" ]
16+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
17+
- apiGroups: [ "" ]
18+
resources: [ "services" ]
19+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
20+
- apiGroups: [ "openanalytics.eu" ]
21+
resources: [ "shinyproxies", "shinyproxies/status" ]
22+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
23+
- apiGroups: [ "" ]
24+
resources: [ "customresource" ]
25+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
26+
- apiGroups: [ "" ]
27+
resources: [ "configmaps" ]
28+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
29+
- apiGroups: [ "apiextensions.k8s.io" ]
30+
resources: [ "customresourcedefinitions" ]
31+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
32+
- apiGroups: [ "apps" ]
33+
resources: [ "replicasets" ]
34+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
35+
- apiGroups: [ "extensions" ]
36+
resources: [ "replicasets" ]
37+
verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
3838
---
3939
kind: ClusterRoleBinding
4040
apiVersion: rbac.authorization.k8s.io/v1
4141
metadata:
4242
name: shinyproxy-operator-role
4343
subjects:
44-
- kind: ServiceAccount
45-
namespace: shinyproxy-operator
46-
name: shinyproxy-operator-sa
44+
- kind: ServiceAccount
45+
namespace: shinyproxy-operator
46+
name: shinyproxy-operator-sa
4747
roleRef:
4848
kind: ClusterRole
4949
name: shinyproxy-operator-role

docs/deployment/bases/clustered/skipper-ds/daemonset.yaml

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,59 +17,59 @@ spec:
1717
name: skipper-ingress
1818
labels:
1919
application: skipper-ingress
20-
version: v0.13.44
20+
version: v0.13.44
2121
component: ingress
2222
spec:
2323
priorityClassName: system-cluster-critical
2424
serviceAccountName: skipper-ingress
2525
dnsPolicy: ClusterFirstWithHostNet
2626
containers:
27-
- name: skipper-ingress
28-
image: registry.opensource.zalan.do/teapot/skipper:v0.13.44
29-
ports:
30-
- name: ingress-port
31-
containerPort: 9999
32-
- name: debug-port
33-
containerPort: 9992
34-
env:
35-
- name: KUBE_NAMESPACE
36-
valueFrom:
37-
fieldRef:
38-
fieldPath: metadata.namespace
39-
resources:
40-
requests:
41-
cpu: 50m
42-
memory: 256Mi
43-
limits:
44-
cpu: 100m
45-
memory: 512Mi
46-
args:
47-
- "skipper"
48-
- "-kubernetes"
49-
- "-kubernetes-in-cluster"
50-
- "-kubernetes-path-mode=path-prefix"
51-
- "-kubernetes-https-redirect=false"
52-
- "-address=:9999"
53-
- "-wait-first-route-load"
54-
- "-proxy-preserve-host"
55-
- "-disable-metrics-compat"
56-
- "-debug-listener=:9922"
57-
- "-experimental-upgrade"
58-
- "-metrics-exp-decay-sample"
59-
- "-reverse-source-predicate"
60-
- "-lb-healthcheck-interval=3s"
61-
- "-access-log-json-enabled"
62-
- "-read-timeout-server=2m"
63-
- "-write-timeout-server=2m"
64-
- "-response-header-timeout-backend=2m"
65-
- "-timeout-backend=2m"
66-
readinessProbe:
67-
httpGet:
68-
path: /kube-system/healthz
69-
port: 9999
70-
initialDelaySeconds: 60
71-
timeoutSeconds: 5
72-
securityContext:
73-
readOnlyRootFilesystem: true
74-
runAsNonRoot: true
75-
runAsUser: 999
27+
- name: skipper-ingress
28+
image: registry.opensource.zalan.do/teapot/skipper:v0.13.44
29+
ports:
30+
- name: ingress-port
31+
containerPort: 9999
32+
- name: debug-port
33+
containerPort: 9992
34+
env:
35+
- name: KUBE_NAMESPACE
36+
valueFrom:
37+
fieldRef:
38+
fieldPath: metadata.namespace
39+
resources:
40+
requests:
41+
cpu: 50m
42+
memory: 256Mi
43+
limits:
44+
cpu: 100m
45+
memory: 512Mi
46+
args:
47+
- "skipper"
48+
- "-kubernetes"
49+
- "-kubernetes-in-cluster"
50+
- "-kubernetes-path-mode=path-prefix"
51+
- "-kubernetes-https-redirect=false"
52+
- "-address=:9999"
53+
- "-wait-first-route-load"
54+
- "-proxy-preserve-host"
55+
- "-disable-metrics-compat"
56+
- "-debug-listener=:9922"
57+
- "-experimental-upgrade"
58+
- "-metrics-exp-decay-sample"
59+
- "-reverse-source-predicate"
60+
- "-lb-healthcheck-interval=3s"
61+
- "-access-log-json-enabled"
62+
- "-read-timeout-server=2m"
63+
- "-write-timeout-server=2m"
64+
- "-response-header-timeout-backend=2m"
65+
- "-timeout-backend=2m"
66+
readinessProbe:
67+
httpGet:
68+
path: /kube-system/healthz
69+
port: 9999
70+
initialDelaySeconds: 60
71+
timeoutSeconds: 5
72+
securityContext:
73+
readOnlyRootFilesystem: true
74+
runAsNonRoot: true
75+
runAsUser: 999

docs/deployment/bases/clustered/skipper-ds/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: shinyproxy
44
resources:
5-
- serviceaccount.yaml
6-
- daemonset.yaml
7-
- service.yaml
5+
- serviceaccount.yaml
6+
- daemonset.yaml
7+
- service.yaml

docs/deployment/bases/clustered/skipper-ds/serviceaccount.yaml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ kind: ClusterRole
88
metadata:
99
name: skipper-ingress
1010
rules:
11-
- apiGroups:
12-
- extensions
13-
resources:
14-
- ingresses
15-
verbs:
16-
- get
17-
- list
18-
- apiGroups: [""]
19-
resources:
20-
- namespaces
21-
- services
22-
- endpoints
23-
- pods
24-
verbs:
25-
- get
26-
- list
27-
- apiGroups:
28-
- zalando.org
29-
resources:
30-
- routegroups
31-
verbs:
32-
- get
33-
- list
11+
- apiGroups:
12+
- extensions
13+
resources:
14+
- ingresses
15+
verbs:
16+
- get
17+
- list
18+
- apiGroups: [ "" ]
19+
resources:
20+
- namespaces
21+
- services
22+
- endpoints
23+
- pods
24+
verbs:
25+
- get
26+
- list
27+
- apiGroups:
28+
- zalando.org
29+
resources:
30+
- routegroups
31+
verbs:
32+
- get
33+
- list
3434
---
3535
apiVersion: rbac.authorization.k8s.io/v1
3636
kind: ClusterRoleBinding
@@ -41,8 +41,8 @@ roleRef:
4141
kind: ClusterRole
4242
name: skipper-ingress
4343
subjects:
44-
- kind: ServiceAccount
45-
name: skipper-ingress
44+
- kind: ServiceAccount
45+
name: skipper-ingress
4646
---
4747
apiVersion: rbac.authorization.k8s.io/v1
4848
kind: RoleBinding
@@ -53,5 +53,5 @@ roleRef:
5353
kind: ClusterRole
5454
name: hostnetwork-psp
5555
subjects:
56-
- kind: ServiceAccount
57-
name: skipper-ingress
56+
- kind: ServiceAccount
57+
name: skipper-ingress

0 commit comments

Comments
 (0)