diff --git a/manifests/nginx_ingress_http.yaml b/manifests/nginx_ingress_http.yaml index 50ff81c79eaa02647562456809226d1aed847204..fe262d3283a6d857097ad161bb36f9b37b33a7c3 100644 --- a/manifests/nginx_ingress_http.yaml +++ b/manifests/nginx_ingress_http.yaml @@ -22,13 +22,13 @@ spec: name: webuiservice port: number: 3000 - - path: /context(/|$)(.*) - pathType: Prefix - backend: - service: - name: contextservice - port: - number: 8080 + #- path: /context(/|$)(.*) + # pathType: Prefix + # backend: + # service: + # name: contextservice + # port: + # number: 8080 - path: /()(restconf/.*) pathType: Prefix backend: diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml index 3828ee419941fcfac00e005ec3eac7b2d4df4dfb..d0a64871a654e91c91bac9e2782b978fc821cea8 100644 --- a/manifests/webuiservice.yaml +++ b/manifests/webuiservice.yaml @@ -60,43 +60,43 @@ spec: limits: cpu: 700m memory: 1024Mi - #- name: grafana - # image: grafana/grafana:8.5.11 - # imagePullPolicy: IfNotPresent - # ports: - # - containerPort: 3000 - # name: http-grafana - # protocol: TCP - # env: - # - name: GF_SERVER_ROOT_URL - # value: "http://0.0.0.0:3000/grafana/" - # - name: GF_SERVER_SERVE_FROM_SUB_PATH - # value: "true" - # readinessProbe: - # failureThreshold: 3 - # httpGet: - # path: /robots.txt - # port: 3000 - # scheme: HTTP - # initialDelaySeconds: 10 - # periodSeconds: 30 - # successThreshold: 1 - # timeoutSeconds: 2 - # livenessProbe: - # failureThreshold: 3 - # initialDelaySeconds: 30 - # periodSeconds: 10 - # successThreshold: 1 - # tcpSocket: - # port: 3000 - # timeoutSeconds: 1 - # resources: - # requests: - # cpu: 250m - # memory: 750Mi - # limits: - # cpu: 700m - # memory: 1024Mi + - name: grafana + image: grafana/grafana:8.5.11 + imagePullPolicy: IfNotPresent + ports: + - containerPort: 3000 + name: http-grafana + protocol: TCP + env: + - name: GF_SERVER_ROOT_URL + value: "http://0.0.0.0:3000/grafana/" + - name: GF_SERVER_SERVE_FROM_SUB_PATH + value: "true" + readinessProbe: + failureThreshold: 3 + httpGet: + path: /robots.txt + port: 3000 + scheme: HTTP + initialDelaySeconds: 10 + periodSeconds: 30 + successThreshold: 1 + timeoutSeconds: 2 + livenessProbe: + failureThreshold: 3 + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + tcpSocket: + port: 3000 + timeoutSeconds: 1 + resources: + requests: + cpu: 250m + memory: 750Mi + limits: + cpu: 700m + memory: 1024Mi --- apiVersion: v1 kind: Service @@ -110,6 +110,6 @@ spec: - name: webui port: 8004 targetPort: 8004 - #- name: grafana - # port: 3000 - # targetPort: 3000 + - name: grafana + port: 3000 + targetPort: 3000