Skip to content

Commit

Permalink
fix: linting
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Fornaro <[email protected]>
  • Loading branch information
xunholy committed Aug 26, 2021
1 parent fe87ef1 commit c269b2b
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 76 deletions.
27 changes: 0 additions & 27 deletions .github/.yamllint.yml

This file was deleted.

88 changes: 44 additions & 44 deletions k8s/core/overlays/staging/patch.istio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,53 @@ metadata:
name: istio-1.11.0
namespace: istio-system
spec:
meshConfig:
trustDomain: cluster.local
values:
global:
caAddress: cert-manager-istio-csr.network.svc:443
# meshConfig:
# trustDomain: cluster.local
# values:
# global:
# caAddress: cert-manager-istio-csr.network.svc:443
components:
ingressGateways:
- enabled: true
k8s:
service:
loadBalancerIP: 192.168.1.180
pilot:
k8s:
env:
# Disable istiod CA Sever functionality
- name: ENABLE_CA_SERVER
value: "false"
overlays:
- apiVersion: apps/v1
kind: Deployment
name: istiod
patches:
# Mount istiod serving and webhook certificate from Secret mount
- path: spec.template.spec.containers.[name:discovery].args[-1]
value: "--tlsCertFile=/etc/cert-manager/tls/tls.crt"
- path: spec.template.spec.containers.[name:discovery].args[-1]
value: "--tlsKeyFile=/etc/cert-manager/tls/tls.key"
- path: spec.template.spec.containers.[name:discovery].args[-1]
value: "--caCertFile=/etc/cert-manager/ca/root-cert.pem"
- path: spec.template.spec.containers.[name:discovery].volumeMounts[-1]
value:
name: cert-manager
mountPath: "/etc/cert-manager/tls"
readOnly: true
- path: spec.template.spec.containers.[name:discovery].volumeMounts[-1]
value:
name: ca-root-cert
mountPath: "/etc/cert-manager/ca"
readOnly: true
- path: spec.template.spec.volumes[-1]
value:
name: cert-manager
secret:
secretName: istiod-tls
- path: spec.template.spec.volumes[-1]
value:
name: ca-root-cert
configMap:
defaultMode: 420
name: istio-ca-root-cert
# pilot:
# k8s:
# env:
# # Disable istiod CA Sever functionality
# - name: ENABLE_CA_SERVER
# value: "false"
# overlays:
# - apiVersion: apps/v1
# kind: Deployment
# name: istiod
# patches:
# # Mount istiod serving and webhook certificate from Secret mount
# - path: spec.template.spec.containers.[name:discovery].args[-1]
# value: "--tlsCertFile=/etc/cert-manager/tls/tls.crt"
# - path: spec.template.spec.containers.[name:discovery].args[-1]
# value: "--tlsKeyFile=/etc/cert-manager/tls/tls.key"
# - path: spec.template.spec.containers.[name:discovery].args[-1]
# value: "--caCertFile=/etc/cert-manager/ca/root-cert.pem"
# - path: spec.template.spec.containers.[name:discovery].volumeMounts[-1]
# value:
# name: cert-manager
# mountPath: "/etc/cert-manager/tls"
# readOnly: true
# - path: spec.template.spec.containers.[name:discovery].volumeMounts[-1]
# value:
# name: ca-root-cert
# mountPath: "/etc/cert-manager/ca"
# readOnly: true
# - path: spec.template.spec.volumes[-1]
# value:
# name: cert-manager
# secret:
# secretName: istiod-tls
# - path: spec.template.spec.volumes[-1]
# value:
# name: ca-root-cert
# configMap:
# defaultMode: 420
# name: istio-ca-root-cert
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ spec:
enabled: true
## Enable secret rotation feature [alpha]
enableSecretRotation: true

1 change: 0 additions & 1 deletion k8s/namespaces/base/litmus/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ spec:
timeout: 10m
recreate: true
cleanupOnFail: true

4 changes: 2 additions & 2 deletions k8s/namespaces/base/network/istio-csr/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ spec:
# presented to istio-agents. istio-agents must route to istio-csr using one
# of these DNS names.
certificateDNSNames:
- cert-manager-istio-csr.network.svc
- cert-manager-istio-csr.network.svc
volumes:
- name: root-ca
configMap:
name: istio-ca-root-cert
volumeMounts:
- name: root-ca
mountPath: /etc/tls
mountPath: /etc/tls
2 changes: 1 addition & 1 deletion k8s/namespaces/overlays/staging/patch.helmreleases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ spec:
raspbernetes.com. IN SOA ns.dns.raspbernetes.com. hostmaster.raspbernetes.com. 1610541154 7200 1800 86400 30
raspbernetes.com. IN NS ns.dns.raspbernetes.com.
raspbernetes.com. IN A 192.168.1.180
*.stg.raspbernetes.com. IN CNAME raspbernetes.com.
*.stg.raspbernetes.com. IN CNAME raspbernetes.com.

0 comments on commit c269b2b

Please sign in to comment.