Skip to content
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.

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

trying to rename pods and svc in roc-umbrella #3

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion aether-roc-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Declare variables to be passed into your templates.

replicaCount: 1

fullnameOverride: aether-roc-api
image:
repository: onosproject/aether-roc-api
tag: "{{ .Chart.AppVersion }}"
Expand Down
4 changes: 2 additions & 2 deletions aether-roc-gui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Declare variables to be passed into your templates.

replicaCount: 1

fullnameOverride: aether-roc-gui-v2-1
image:
repository: onosproject/aether-roc-gui
tag: "{{ .Chart.AppVersion }}"
Expand Down Expand Up @@ -62,7 +62,7 @@ affinity: {}

aetherservices:
aether-roc-api:
service: "{{ .Release.Name }}-aether-roc-api"
service: "aether-roc-api"
http: 8181
protocol: http
streamTimeout: 3600
Expand Down
37 changes: 21 additions & 16 deletions aether-roc-umbrella/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,21 +119,21 @@ aether-roc-api: {}
aether-roc-gui-v2:
grafana:
proxyEnabled: true
service: "{{ .Release.Name }}-grafana" # the grafana hostname - use FQDN for other namespaces
service: "grafana" # the grafana hostname - use FQDN for other namespaces
prometheus:
acc:
proxyEnabled: true
service: "{{ .Release.Name }}-prom-label-proxy-acc"
service: "prom-label-proxy-acc"
protocol: http
port: 8080
amp:
proxyEnabled: true
service: "{{ .Release.Name }}-prom-label-proxy-amp"
service: "prom-label-proxy-amp"
protocol: http
port: 8080
site:
- name: ace1
service: "{{ .Release.Name }}-prometheus-ace-server"
service: "prometheus-ace-server"
protocol: http
port: 80

Expand All @@ -143,21 +143,21 @@ aether-roc-gui-v2-1:
sdnfabric: false
grafana:
proxyEnabled: true
service: "{{ .Release.Name }}-grafana" # the grafana hostname - use FQDN for other namespaces
service: "grafana" # the grafana hostname - use FQDN for other namespaces
prometheus:
acc:
proxyEnabled: true
service: "{{ .Release.Name }}-prom-label-proxy-acc"
service: "prom-label-proxy-acc"
protocol: http
port: 8080
amp:
proxyEnabled: true
service: "{{ .Release.Name }}-prom-label-proxy-amp"
service: "prom-label-proxy-amp"
protocol: http
port: 8080
site:
- name: ace1
service: "{{ .Release.Name }}-prometheus-ace-server"
service: "prometheus-ace-server"
protocol: http
port: 80

Expand All @@ -176,16 +176,19 @@ subscriber-proxy:

# Prom label Proxy
prom-label-proxy-amp:
fullnameOverride: prom-label-proxy-amp
prometheusEnabled: false
config:
upstream: "http://{{ .Release.Name }}-prometheus-amp-server"
upstream: "http://prometheus-amp-server"

prom-label-proxy-acc:
fullnameOverride: prom-label-proxy-acc
prometheusEnabled: false
config:
upstream: "http://{{ .Release.Name }}-prometheus-acc-server"
upstream: "http://prometheus-acc-server"

grafana:
fullnameOverride: grafana
sidecar:
dashboards:
enabled: true
Expand All @@ -198,23 +201,23 @@ grafana:
source:
- name: acc
protocol: http
service: "{{ .Release.Name }}-prometheus-acc-server"
service: "prometheus-acc-server"
port: 80
- name: amp
protocol: http
service: "{{ .Release.Name }}-prometheus-amp-server"
service: "prometheus-amp-server"
port: 80
- name: acme-chicago
protocol: http
service: "{{ .Release.Name }}-prometheus-ace-server"
service: "prometheus-ace-server"
port: 80
- name: starbucks-newyork
protocol: http
service: "{{ .Release.Name }}-prometheus-ace-server"
service: "prometheus-ace-server"
port: 80
- name: starbucks-seattle
protocol: http
service: "{{ .Release.Name }}-prometheus-ace-server"
service: "prometheus-ace-server"
port: 80
grafana.ini:
log:
Expand Down Expand Up @@ -259,6 +262,7 @@ grafana:
name: KeyCloak

prometheus-acc:
fullnameOverride: prometheus-acc
prometheus-pushgateway:
enabled: false
prometheus-node-exporter:
Expand Down Expand Up @@ -366,9 +370,10 @@ prometheus-ace:
# SD-Core Test Dummy
# proxy_pass has to be added or nginx will not log the $request_body
sdcore-test-dummy:
fullnameOverride: sdcore-test-dummy
service:
type: ClusterIP
existingServerBlockConfigmap: "{{ .Release.Name }}-sdcore-test-dummy"
existingServerBlockConfigmap: "sdcore-test-dummy"

# ONOS-CONFIG
onos-config:
Expand Down
3 changes: 1 addition & 2 deletions sdcore-adapter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

nameOverride: ""
fullnameOverride: ""

fullnameOverride: "sdcore-adapter-v2-1"
replicaCount: 1
annotations: {}

Expand Down
2 changes: 1 addition & 1 deletion subscriber-proxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

nameOverride: ""
fullnameOverride: ""
fullnameOverride: "subscriber-proxy"

replicaCount: 1
annotations: {}
Expand Down