Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions kustomize/csi/openebs/dynamic-localpv/storageclass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
- name: StorageType
value: hostpath
- name: BasePath
value: ${local_volume_path:-/var/local}
value: ${LOCAL_VOLUME_PATH:-/var/local}
provisioner: openebs.io/local
reclaimPolicy: Delete
volumeBindingMode: WaitForFirstConsumer
Expand All @@ -25,7 +25,7 @@ metadata:
- name: StorageType
value: hostpath
- name: BasePath
value: ${local_volume_path:-/var/local}
value: ${LOCAL_VOLUME_PATH:-/var/local}
provisioner: openebs.io/local
reclaimPolicy: Delete
volumeBindingMode: WaitForFirstConsumer
2 changes: 1 addition & 1 deletion kustomize/demo/bookinfo/ingress/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo-bookinfo
spec:
rules:
- host: bookinfo.${external_domain:-test}
- host: bookinfo.${DOMAIN:-test}
http:
paths:
- path: /
Expand Down
2 changes: 1 addition & 1 deletion kustomize/demo/static/ingress/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo-static
spec:
rules:
- host: static.${external_domain:-test}
- host: static.${DOMAIN:-test}
http:
paths:
- path: /
Expand Down
16 changes: 8 additions & 8 deletions kustomize/dns/coredns/etcd/certificates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ spec:
kind: ClusterIssuer
commonName: etcd-peer
dnsNames:
- "etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "*.etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "*.etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "etcd.system-dns.svc.cluster.local"
- "*.etcd.system-dns.svc.cluster.local"
- "etcd-headless.system-dns.svc.cluster.local"
- "*.etcd-headless.system-dns.svc.cluster.local"
usages:
- digital signature
- key encipherment
Expand All @@ -33,10 +33,10 @@ spec:
kind: ClusterIssuer
commonName: etcd
dnsNames:
- "etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "*.etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "*.etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "etcd.system-dns.svc.cluster.local"
- "*.etcd.system-dns.svc.cluster.local"
- "etcd-headless.system-dns.svc.cluster.local"
- "*.etcd-headless.system-dns.svc.cluster.local"
usages:
- server auth
- client auth
Expand Down
4 changes: 2 additions & 2 deletions kustomize/dns/external-dns/coredns/patches/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
path: /spec/values/env/-
value:
name: ETCD_URLS
value: https://etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}:2379
value: https://etcd.system-dns.svc.cluster.local:2379
- op: add
path: /spec/values/env/-
value:
Expand All @@ -26,7 +26,7 @@
path: /spec/values/env/-
value:
name: ETCD_TLS_SERVER_NAME
value: etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}
value: etcd.system-dns.svc.cluster.local
- op: add
path: /spec/values/extraVolumes/-
value:
Expand Down
2 changes: 1 addition & 1 deletion kustomize/dns/external-dns/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ spec:
extraVolumeMounts: []
sources: []
domainFilters:
- "${external_domain:-test}"
- "${DOMAIN:-test}"
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
policy: sync
registry: txt
domainFilters:
- ${external_domain:-test}
- ${DOMAIN:-test}
serviceAccount:
create: true
name: external-dns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ spec:
controller:
service:
type: LoadBalancer
loadBalancerIP: ${loadbalancer_ip}
loadBalancerIP: ${LOADBALANCER_IP_START}
8 changes: 4 additions & 4 deletions kustomize/observability/elasticsearch/certificates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ spec:
- "elasticsearch-master"
- "elasticsearch-master.system-observability"
- "elasticsearch-master.system-observability.svc"
- "elasticsearch-master.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "*.elasticsearch-master.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "elasticsearch-master.system-observability.svc.cluster.local"
- "*.elasticsearch-master.system-observability.svc.cluster.local"
- "elasticsearch-master-headless"
- "elasticsearch-master-headless.system-observability"
- "elasticsearch-master-headless.system-observability.svc"
- "elasticsearch-master-headless.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "*.elasticsearch-master-headless.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
- "elasticsearch-master-headless.system-observability.svc.cluster.local"
- "*.elasticsearch-master-headless.system-observability.svc.cluster.local"
usages:
- server auth
- client auth
2 changes: 1 addition & 1 deletion kustomize/observability/grafana/ingress/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: system-observability
spec:
rules:
- host: grafana.${external_domain:-test}
- host: grafana.${DOMAIN:-test}
http:
paths:
- path: /
Expand Down
2 changes: 1 addition & 1 deletion kustomize/observability/kibana/ingress/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: kibana.${external_domain:-test}
- host: kibana.${DOMAIN:-test}
http:
paths:
- path: /
Expand Down
Loading