Commit e281f671 authored by Andres Anaya Amariels's avatar Andres Anaya Amariels 🚀
Browse files

Merge remote-tracking branch 'origin/staging' into OCF47-logs-in-register-service

parents 06fceaa4 7ec3bb23

.gitignore

+0 −4
Original line number Original line Diff line number Diff line
@@ -36,8 +36,4 @@ docs/testing_with_postman/package-lock.json 
results

results





helm/capif/*.lock

helm/capif/*.lock

<<<<<<< HEAD

helm/capif/charts

=======

helm/capif/charts/tempo*
 
helm/capif/charts/tempo*
 
>>>>>>> staging

helm/capif/Chart.yaml

+10 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,16 @@ dependencies: 
    version: "*"

    version: "*"

  - name: redis

  - name: redis

    version: "*"

    version: "*"

  - name: fluentbit

    version: "*"

  - name: grafana

    version: "*"

  - name: loki

    version: "*"

  - name: otelcollector

    version: "*"

  - name: renderer

    version: "*"

  - name: "tempo"

  - name: "tempo"

    condition: tempo.enabled

    condition: tempo.enabled

    repository: "https://grafana.github.io/helm-charts"

    repository: "https://grafana.github.io/helm-charts"

helm/capif/charts/fluentbit/.helmignore

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
# Patterns to ignore when building packages.

# This supports shell glob matching, relative path matching, and

# negation (prefixed with !). Only one pattern per line.

.DS_Store

# Common VCS dirs

.git/

.gitignore

.bzr/

.bzrignore

.hg/

.hgignore

.svn/

# Common backup files

*.swp

*.bak

*.tmp

*.orig

*~

# Various IDEs

.project

.idea/

*.tmproj

.vscode/

helm/capif/charts/fluentbit/Chart.yaml

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
apiVersion: v2

name: fluentbit

description: A Helm chart for Kubernetes



# A chart can be either an 'application' or a 'library' chart.

#

# Application charts are a collection of templates that can be packaged into versioned archives

# to be deployed.

#

# Library charts provide useful utilities or functions for the chart developer. They're included as

# a dependency of application charts to inject those utilities and functions into the rendering

# pipeline. Library charts do not define any templates and therefore cannot be deployed.

type: application



# This is the chart version. This version number should be incremented each time you make changes

# to the chart and its templates, including the app version.

# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 0.1.0



# This is the version number of the application being deployed. This version number should be

# incremented each time you make changes to the application. Versions are not expected to

# follow Semantic Versioning. They should reflect the version the application is using.

# It is recommended to use it with quotes.

appVersion: "1.16.0"

helm/capif/charts/fluentbit/templates/NOTES.txt

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
1. Get the application URL by running these commands:

{{- if .Values.ingress.enabled }}

{{- range $host := .Values.ingress.hosts }}

  {{- range .paths }}

  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}

  {{- end }}

{{- end }}

{{- else if contains "NodePort" .Values.service.type }}

  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "fluentbit.fullname" . }})

  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")

  echo http://$NODE_IP:$NODE_PORT

{{- else if contains "LoadBalancer" .Values.service.type }}

     NOTE: It may take a few minutes for the LoadBalancer IP to be available.

           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "fluentbit.fullname" . }}'

  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "fluentbit.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")

  echo http://$SERVICE_IP:{{ .Values.service.port }}

{{- else if contains "ClusterIP" .Values.service.type }}

  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "fluentbit.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")

  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")

  echo "Visit http://127.0.0.1:8080 to use your application"

  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT

{{- end }}