From 1b6620fd7445581f582eda7407ff32e99b9e4f27 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 15 Feb 2023 12:49:42 +0100 Subject: [PATCH] chore: relocate chart Signed-off-by: Mark Sagi-Kazar --- charts/log-socket/Chart.yaml | 24 ----- charts/log-socket/README.md | 3 + charts/log-socket/templates/NOTES.txt | 22 ----- charts/log-socket/templates/_helpers.tpl | 74 --------------- charts/log-socket/templates/clusterrole.yaml | 14 --- .../templates/clusterrolebinding.yaml | 18 ---- charts/log-socket/templates/deployment.yaml | 67 -------------- charts/log-socket/templates/hpa.yaml | 28 ------ charts/log-socket/templates/ingress.yaml | 41 --------- charts/log-socket/templates/service.yaml | 19 ---- .../log-socket/templates/serviceaccount.yaml | 12 --- .../log-socket/templates/servicemonitor.yaml | 30 ------- .../templates/tests/test-connection.yaml | 15 ---- charts/log-socket/values.yaml | 90 ------------------- 14 files changed, 3 insertions(+), 454 deletions(-) delete mode 100644 charts/log-socket/Chart.yaml create mode 100644 charts/log-socket/README.md delete mode 100644 charts/log-socket/templates/NOTES.txt delete mode 100644 charts/log-socket/templates/_helpers.tpl delete mode 100644 charts/log-socket/templates/clusterrole.yaml delete mode 100644 charts/log-socket/templates/clusterrolebinding.yaml delete mode 100644 charts/log-socket/templates/deployment.yaml delete mode 100644 charts/log-socket/templates/hpa.yaml delete mode 100644 charts/log-socket/templates/ingress.yaml delete mode 100644 charts/log-socket/templates/service.yaml delete mode 100644 charts/log-socket/templates/serviceaccount.yaml delete mode 100644 charts/log-socket/templates/servicemonitor.yaml delete mode 100644 charts/log-socket/templates/tests/test-connection.yaml delete mode 100644 charts/log-socket/values.yaml diff --git a/charts/log-socket/Chart.yaml b/charts/log-socket/Chart.yaml deleted file mode 100644 index 2712621..0000000 --- a/charts/log-socket/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: log-socket -description: A Helm chart for the log-socket service - -# 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.2 - -# 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: "0.0.3" diff --git a/charts/log-socket/README.md b/charts/log-socket/README.md new file mode 100644 index 0000000..58baa1d --- /dev/null +++ b/charts/log-socket/README.md @@ -0,0 +1,3 @@ +# Log generatar chart + +The chart has been relocated [here](https://github.com/kube-logging/helm-charts/tree/main/charts/log-socket). diff --git a/charts/log-socket/templates/NOTES.txt b/charts/log-socket/templates/NOTES.txt deleted file mode 100644 index 602916f..0000000 --- a/charts/log-socket/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -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 "log-socket.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 "log-socket.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "log-socket.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 "log-socket.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 }} diff --git a/charts/log-socket/templates/_helpers.tpl b/charts/log-socket/templates/_helpers.tpl deleted file mode 100644 index 9733495..0000000 --- a/charts/log-socket/templates/_helpers.tpl +++ /dev/null @@ -1,74 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "log-socket.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "log-socket.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "log-socket.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "log-socket.labels" -}} -helm.sh/chart: {{ include "log-socket.chart" . }} -{{ include "log-socket.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "log-socket.selectorLabels" -}} -app.kubernetes.io/name: {{ include "log-socket.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "log-socket.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "log-socket.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} - -{{/* -Provides the namespace the chart will be installed in using the builtin .Release.Namespace, -or, if provided, a manually overwritten namespace value. -*/}} -{{- define "log-socket.namespace" -}} -{{- if .Values.namespaceOverride -}} -{{ .Values.namespaceOverride -}} -{{- else -}} -{{ .Release.Namespace }} -{{- end -}} -{{- end -}} \ No newline at end of file diff --git a/charts/log-socket/templates/clusterrole.yaml b/charts/log-socket/templates/clusterrole.yaml deleted file mode 100644 index 5899c80..0000000 --- a/charts/log-socket/templates/clusterrole.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if .Values.rbac.enabled }} - -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "log-socket.fullname" . }} -rules: -- apiGroups: - - '*' - resources: - - '*' - verbs: - - '*' -{{- end }} \ No newline at end of file diff --git a/charts/log-socket/templates/clusterrolebinding.yaml b/charts/log-socket/templates/clusterrolebinding.yaml deleted file mode 100644 index 7896a1f..0000000 --- a/charts/log-socket/templates/clusterrolebinding.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if .Values.rbac.enabled }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "log-socket.fullname" . }} - labels: -{{ include "log-socket.labels" . | indent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "log-socket.fullname" . }} - namespace: {{ include "log-socket.namespace" . }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "log-socket.fullname" . }} - - {{- end }} \ No newline at end of file diff --git a/charts/log-socket/templates/deployment.yaml b/charts/log-socket/templates/deployment.yaml deleted file mode 100644 index 64fb488..0000000 --- a/charts/log-socket/templates/deployment.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "log-socket.fullname" . }} - labels: - {{- include "log-socket.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "log-socket.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "log-socket.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "log-socket.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - args: - - "--service-addr" - - {{ include "log-socket.fullname" . }}.{{ include "log-socket.namespace" . }}.svc:10000 - ports: - - name: http-ingest - containerPort: 10000 - protocol: TCP - - name: http-api - containerPort: 10001 - protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: http-ingest - readinessProbe: - httpGet: - path: /healthz - port: http-ingest - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/charts/log-socket/templates/hpa.yaml b/charts/log-socket/templates/hpa.yaml deleted file mode 100644 index c709f4a..0000000 --- a/charts/log-socket/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "log-socket.fullname" . }} - labels: - {{- include "log-socket.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "log-socket.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/log-socket/templates/ingress.yaml b/charts/log-socket/templates/ingress.yaml deleted file mode 100644 index ae2c5ce..0000000 --- a/charts/log-socket/templates/ingress.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "log-socket.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "log-socket.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - backend: - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} diff --git a/charts/log-socket/templates/service.yaml b/charts/log-socket/templates/service.yaml deleted file mode 100644 index aa2acec..0000000 --- a/charts/log-socket/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "log-socket.fullname" . }} - labels: - {{- include "log-socket.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.ingestPort }} - targetPort: http-ingest - protocol: TCP - name: http-ingest - - port: {{ .Values.service.apiPort }} - targetPort: http-api - protocol: TCP - name: http-api - selector: - {{- include "log-socket.selectorLabels" . | nindent 4 }} diff --git a/charts/log-socket/templates/serviceaccount.yaml b/charts/log-socket/templates/serviceaccount.yaml deleted file mode 100644 index 98015e7..0000000 --- a/charts/log-socket/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "log-socket.serviceAccountName" . }} - labels: - {{- include "log-socket.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/log-socket/templates/servicemonitor.yaml b/charts/log-socket/templates/servicemonitor.yaml deleted file mode 100644 index ba58d61..0000000 --- a/charts/log-socket/templates/servicemonitor.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{ if .Values.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "log-socket.fullname" . }} - namespace: {{ include "log-socket.namespace" . }} - labels: -{{ include "log-socket.labels" . | indent 4 }} -{{- with .Values.serviceMonitor.additionalLabels }} - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - selector: - matchLabels: -{{ include "log-socket.labels" . | indent 6 }} - endpoints: - - port: http-ingest - path: /metrics - {{- with .Values.serviceMonitor.metricsRelabelings }} - metricRelabelings: - {{- toYaml . | nindent 6 }} - {{- end }} - {{- with .Values.serviceMonitor.relabelings }} - relabelings: - {{- toYaml . | nindent 4 }} - {{- end }} - namespaceSelector: - matchNames: - - {{ include "log-socket.namespace" . }} -{{- end }} \ No newline at end of file diff --git a/charts/log-socket/templates/tests/test-connection.yaml b/charts/log-socket/templates/tests/test-connection.yaml deleted file mode 100644 index 08f5514..0000000 --- a/charts/log-socket/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "log-socket.fullname" . }}-test-connection" - labels: - {{- include "log-socket.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "log-socket.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/charts/log-socket/values.yaml b/charts/log-socket/values.yaml deleted file mode 100644 index b94df4b..0000000 --- a/charts/log-socket/values.yaml +++ /dev/null @@ -1,90 +0,0 @@ -# Default values for log-socket. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: ghcr.io/banzaicloud/log-socket - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: "latest" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -rbac: - enabled: true - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -serviceMonitor: - enabled: true - -service: - type: ClusterIP - ingestPort: 10000 - apiPort: 10001 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - backend: - serviceName: chart-example.local - servicePort: 80 - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {}