Skip to content

Commit be85a5d

Browse files
authored
Merge pull request #920 from rackerlabs/dexop-yamllint
chore: yaml linting issues
2 parents bd4f8f5 + bdff9c0 commit be85a5d

File tree

6 files changed

+44
-62
lines changed

6 files changed

+44
-62
lines changed

go/dexop/config/crd/kustomization.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- bases/dex.rax.io_clients.yaml
6-
# +kubebuilder:scaffold:crdkustomizeresource
5+
- bases/dex.rax.io_clients.yaml
6+
# +kubebuilder:scaffold:crdkustomizeresource
7+
patches: []
78

8-
patches:
99
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1010
# patches here are for enabling the conversion webhook for each CRD
1111
# +kubebuilder:scaffold:crdkustomizewebhookpatch
1212

1313
# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
1414
# patches here are for enabling the CA injection for each CRD
15-
#- path: patches/cainjection_in_clients.yaml
15+
# - path: patches/cainjection_in_clients.yaml
1616
# +kubebuilder:scaffold:crdkustomizecainjectionpatch
1717

1818
# [WEBHOOK] To enable webhook, uncomment the following section
1919
# the following config is for teaching kustomize how to do kustomization for CRDs.
2020

21-
#configurations:
22-
#- kustomizeconfig.yaml
21+
# configurations:
22+
# - kustomizeconfig.yaml

go/dexop/config/default/kustomization.yaml

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,54 @@
11
# Adds namespace to all resources.
22
namespace: dexop-system
3-
43
# Value of this field is prepended to the
54
# names of all resources, e.g. a deployment named
65
# "wordpress" becomes "alices-wordpress".
76
# Note that it should also match with the prefix (text before '-') of the namespace
87
# field above.
98
namePrefix: dexop-
10-
119
# Labels to add to all resources and selectors.
12-
#labels:
13-
#- includeSelectors: true
10+
# labels:
11+
# includeSelectors: true
1412
# pairs:
1513
# someName: someValue
16-
1714
resources:
18-
- ../crd
19-
- ../rbac
20-
- ../manager
21-
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
22-
# crd/kustomization.yaml
23-
#- ../webhook
24-
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
25-
#- ../certmanager
26-
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
27-
#- ../prometheus
28-
# [METRICS] Expose the controller manager metrics service.
29-
- metrics_service.yaml
30-
# [NETWORK POLICY] Protect the /metrics endpoint and Webhook Server with NetworkPolicy.
31-
# Only Pod(s) running a namespace labeled with 'metrics: enabled' will be able to gather the metrics.
32-
# Only CR(s) which requires webhooks and are applied on namespaces labeled with 'webhooks: enabled' will
33-
# be able to communicate with the Webhook Server.
34-
#- ../network-policy
35-
15+
- ../crd
16+
- ../rbac
17+
- ../manager
18+
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
19+
# crd/kustomization.yaml
20+
# ../webhook
21+
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
22+
# ../certmanager
23+
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
24+
# ../prometheus
25+
# [METRICS] Expose the controller manager metrics service.
26+
- metrics_service.yaml
27+
# [NETWORK POLICY] Protect the /metrics endpoint and Webhook Server with NetworkPolicy.
28+
# Only Pod(s) running a namespace labeled with 'metrics: enabled' will be able to gather the metrics.
29+
# Only CR(s) which requires webhooks and are applied on namespaces labeled with 'webhooks: enabled' will
30+
# be able to communicate with the Webhook Server.
31+
# ../network-policy
3632
# Uncomment the patches line if you enable Metrics, and/or are using webhooks and cert-manager
3733
patches:
38-
# [METRICS] The following patch will enable the metrics endpoint using HTTPS and the port :8443.
39-
# More info: https://book.kubebuilder.io/reference/metrics
40-
- path: manager_metrics_patch.yaml
41-
target:
42-
kind: Deployment
34+
# [METRICS] The following patch will enable the metrics endpoint using HTTPS and the port :8443.
35+
# More info: https://book.kubebuilder.io/reference/metrics
36+
- path: manager_metrics_patch.yaml
37+
target:
38+
kind: Deployment
4339

4440
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
4541
# crd/kustomization.yaml
46-
#- path: manager_webhook_patch.yaml
42+
# path: manager_webhook_patch.yaml
4743

4844
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
4945
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
5046
# 'CERTMANAGER' needs to be enabled to use ca injection
51-
#- path: webhookcainjection_patch.yaml
47+
# path: webhookcainjection_patch.yaml
5248

5349
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
5450
# Uncomment the following replacements to add the cert-manager CA injection annotations
55-
#replacements:
51+
# eplacements:
5652
# - source: # Add cert-manager annotation to ValidatingWebhookConfiguration, MutatingWebhookConfiguration and CRDs
5753
# kind: Certificate
5854
# group: cert-manager.io

go/dexop/config/manifests/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ resources:
99
# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
1010
# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
1111
# These patches remove the unnecessary "cert" volume and its manager container volumeMount.
12-
#patches:
13-
#- target:
12+
# atches:
13+
# target:
1414
# group: apps
1515
# version: v1
1616
# kind: Deployment

go/dexop/config/prometheus/monitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
endpoints:
1313
- path: /metrics
14-
port: https # Ensure this is the name of the port that exposes HTTPS metrics
14+
port: https # Ensure this is the name of the port that exposes HTTPS metrics
1515
scheme: https
1616
bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
1717
tlsConfig:

go/dexop/helm/values.yaml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
replicaCount: 1
2-
32
# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
43
image:
54
repository: ghcr.io/rackerlabs/understack/dexop
65
# This sets the pull policy for images.
76
pullPolicy: IfNotPresent
87
# Overrides the image tag whose default is the chart appVersion.
98
tag: ""
10-
119
# This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
1210
imagePullSecrets: []
1311
# This is to override the chart name.
1412
nameOverride: ""
1513
fullnameOverride: ""
16-
17-
#This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
14+
# This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
1815
serviceAccount:
1916
# Specifies whether a service account should be created
2017
create: true
@@ -25,38 +22,32 @@ serviceAccount:
2522
# The name of the service account to use.
2623
# If not set and create is true, a name is generated using the fullname template
2724
name: ""
28-
2925
# This is for setting Kubernetes Annotations to a Pod.
3026
# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
3127
podAnnotations: {}
3228
# This is for setting Kubernetes Labels to a Pod.
3329
# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
3430
podLabels: {}
35-
3631
podSecurityContext:
3732
runAsNonRoot: true
38-
3933
securityContext:
4034
allowPrivilegeEscalation: false
4135
capabilities:
4236
drop:
4337
- ALL
44-
4538
# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/
4639
service:
4740
# This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
4841
type: ClusterIP
4942
# This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
5043
port: 80
51-
5244
# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
5345
ingress:
5446
enabled: false
5547
className: ""
56-
annotations:
57-
{}
58-
# kubernetes.io/ingress.class: nginx
59-
# kubernetes.io/tls-acme: "true"
48+
annotations: {}
49+
# kubernetes.io/ingress.class: nginx
50+
# kubernetes.io/tls-acme: "true"
6051
hosts:
6152
- host: chart-example.local
6253
paths:
@@ -66,15 +57,13 @@ ingress:
6657
# - secretName: chart-example-tls
6758
# hosts:
6859
# - chart-example.local
69-
7060
resources:
7161
limits:
7262
cpu: 500m
7363
memory: 128Mi
7464
requests:
7565
cpu: 10m
7666
memory: 64Mi
77-
7867
livenessProbe:
7968
httpGet:
8069
path: /healthz
@@ -87,7 +76,6 @@ readinessProbe:
8776
port: 8081
8877
initialDelaySeconds: 5
8978
periodSeconds: 10
90-
9179
# Additional volumes on the output Deployment definition.
9280
volumes: []
9381
# - name: foo
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
issuer: http://127.0.0.1:15556/dex # The URL clients will use to connect to Dex
1+
issuer: http://127.0.0.1:15556/dex # The URL clients will use to connect to Dex
22
storage:
33
type: memory
44
web:
55
http: 127.0.0.1:15556
6-
76
grpc:
87
addr: 127.0.0.1:15557
98
# don't do that in production
109
plainText: true
11-
1210
connectors:
13-
- type: mockCallback
14-
id: mock
15-
name: Example
11+
- type: mockCallback
12+
id: mock
13+
name: Example

0 commit comments

Comments
 (0)