From d4315fc47a26ae14587e280d0806faed409130d0 Mon Sep 17 00:00:00 2001 From: Leo Sok Date: Tue, 3 Jun 2025 19:32:07 +0300 Subject: [PATCH] cassandra changed --- caddy/.helmignore | 26 --- caddy/Chart.yaml | 29 ---- caddy/LICENSE | 19 --- caddy/README.md | 64 -------- caddy/templates/NOTES.txt | 22 --- caddy/templates/_helpers.tpl | 75 --------- caddy/templates/configmap.yaml | 11 -- caddy/templates/deployment.yaml | 105 ------------ caddy/templates/hpa.yaml | 28 ---- caddy/templates/ingress.yaml | 61 ------- caddy/templates/service.yaml | 36 ----- caddy/templates/serviceaccount.yaml | 12 -- caddy/templates/tests/test-connection.yaml | 19 --- caddy/values.yaml | 180 --------------------- cassandra/Chart.yaml | 2 +- cassandra/values.yaml | 2 +- 16 files changed, 2 insertions(+), 689 deletions(-) delete mode 100644 caddy/.helmignore delete mode 100644 caddy/Chart.yaml delete mode 100644 caddy/LICENSE delete mode 100644 caddy/README.md delete mode 100644 caddy/templates/NOTES.txt delete mode 100644 caddy/templates/_helpers.tpl delete mode 100644 caddy/templates/configmap.yaml delete mode 100644 caddy/templates/deployment.yaml delete mode 100644 caddy/templates/hpa.yaml delete mode 100644 caddy/templates/ingress.yaml delete mode 100644 caddy/templates/service.yaml delete mode 100644 caddy/templates/serviceaccount.yaml delete mode 100644 caddy/templates/tests/test-connection.yaml delete mode 100644 caddy/values.yaml diff --git a/caddy/.helmignore b/caddy/.helmignore deleted file mode 100644 index b3123b9..0000000 --- a/caddy/.helmignore +++ /dev/null @@ -1,26 +0,0 @@ -# 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/ - -ci/ -README.md.gotmpl diff --git a/caddy/Chart.yaml b/caddy/Chart.yaml deleted file mode 100644 index 88fc422..0000000 --- a/caddy/Chart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -annotations: - artifacthub.io/changes: | - - kind: changed - description: Bump application to 2.4.5 - artifacthub.io/images: | - - name: caddy - image: caddy:2.4.5 -apiVersion: v2 -appVersion: 2.4.5 -description: A powerful, enterprise-ready, open source web server with automatic HTTPS - written in Go. -home: https://caddyserver.com/ -icon: https://caddyserver.com/resources/images/favicon.png -keywords: -- http -- https -- web -- server -kubeVersion: '>=1.16.0-0' -maintainers: -- email: mark.sagikazar@gmail.com - name: sagikazarmark - url: https://sagikazarmark.hu -name: caddy -sources: -- https://github.com/caddyserver/caddy -- https://github.com/sagikazarmark/helm-charts/tree/master/charts/caddy -type: application -version: 0.0.14 diff --git a/caddy/LICENSE b/caddy/LICENSE deleted file mode 100644 index b27fd7e..0000000 --- a/caddy/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2021 Márk Sági-Kazár - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/caddy/README.md b/caddy/README.md deleted file mode 100644 index 5e75d72..0000000 --- a/caddy/README.md +++ /dev/null @@ -1,64 +0,0 @@ -# caddy - -![version: 0.0.14](https://img.shields.io/badge/version-0.0.14-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.4.5](https://img.shields.io/badge/app%20version-2.4.5-informational?style=flat-square) ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-caddy-informational?style=flat-square)](https://artifacthub.io/packages/helm/sagikazarmark/caddy) - -A powerful, enterprise-ready, open source web server with automatic HTTPS written in Go. - -**Homepage:** - -## TL;DR; - -```bash -helm repo add skm https://charts.sagikazarmark.dev -helm install --generate-name --wait skm/caddy -``` - -## Limitations - -The chart currently only works with a `Caddyfile` that exposes content over port 80. - -HTTPS service support, metrics and a lot of other features are coming in later versions. - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| replicaCount | int | `1` | Number of replicas (pods) to launch. | -| image.repository | string | `"caddy"` | Name of the image repository to pull the container image from. | -| image.pullPolicy | string | `"IfNotPresent"` | [Image pull policy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) for updating already existing images on a node. | -| image.tag | string | `""` | Image tag override for the default value (chart appVersion). | -| imagePullSecrets | list | `[]` | Reference to one or more secrets to be used when [pulling images](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) (from private registries). | -| nameOverride | string | `""` | A name in place of the chart name for `app:` labels. | -| fullnameOverride | string | `""` | A name to substitute for the full names of resources. | -| config | string | `nil` | Caddy configuration file content. Accepts [Caddyfile](https://caddyserver.com/docs/caddyfile) format by default. See `adapter` for other formats. | -| adapter | string | `"caddyfile"` | Caddyfile [config adapter](https://caddyserver.com/docs/config-adapters). Set it to empty string to use JSON. | -| watch | bool | `false` | Watch config file for changes and reload it automatically. | -| volumes | list | `[]` | Additional storage [volumes](https://kubernetes.io/docs/concepts/storage/volumes/). See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1) for details. | -| volumeMounts | list | `[]` | Additional [volume mounts](https://kubernetes.io/docs/tasks/configure-pod-container/configure-volume-storage/). See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1) for details. | -| envFrom | list | `[]` | Additional environment variables mounted from [secrets](https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-environment-variables) or [config maps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables). See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#environment-variables) for details. | -| env | object | `{}` | Additional environment variables passed directly to containers. See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#environment-variables) for details. | -| serviceAccount.create | bool | `true` | Enable service account creation. | -| serviceAccount.annotations | object | `{}` | Annotations to be added to the service account. | -| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template. | -| podAnnotations | object | `{}` | Annotations to be added to pods. | -| podSecurityContext | object | `{}` | Pod [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod). See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context) for details. | -| securityContext | object | `{}` | Container [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container). See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) for details. | -| service.annotations | object | `{}` | Annotations to be added to the service. | -| service.type | string | `"ClusterIP"` | Kubernetes [service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types). | -| service.loadBalancerIP | string | `nil` | Only applies when the service type is LoadBalancer. Load balancer will get created with the IP specified in this field. | -| service.loadBalancerSourceRanges | list | `[]` | (list) If specified (and supported by the cloud provider), traffic through the load balancer will be restricted to the specified client IPs. Valid values are IP CIDR blocks. | -| service.port | int | `80` | Service port. | -| service.nodePort | int | `nil` | Service node port (when applicable). | -| service.externalTrafficPolicy | string | `nil` | Route external traffic to node-local or cluster-wide endoints. Useful for [preserving the client source IP](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip). | -| ingress.enabled | bool | `false` | Enable [ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/). | -| ingress.className | string | `""` | Ingress [class name](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class). | -| ingress.annotations | object | `{}` | Annotations to be added to the ingress. | -| ingress.hosts | list | See [values.yaml](values.yaml). | Ingress host configuration. | -| ingress.tls | list | See [values.yaml](values.yaml). | Ingress TLS configuration. | -| resources | object | No requests or limits. | Container resource [requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/). See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources) for details. | -| autoscaling | object | Disabled by default. | Autoscaling configuration (see [values.yaml](values.yaml) for details). | -| nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) configuration. | -| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for node taints. See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling) for details. | -| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) configuration. See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling) for details. | -| livenessProbe | object | `{"httpGet":{"path":"/","port":"http"}}` | [Liveness probe](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Probe) for details. | -| readinessProbe | object | `{"httpGet":{"path":"/","port":"http"}}` | [Readiness probe](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Probe) for details. | diff --git a/caddy/templates/NOTES.txt b/caddy/templates/NOTES.txt deleted file mode 100644 index 2f81c40..0000000 --- a/caddy/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 "caddy.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 "caddy.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "caddy.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 "caddy.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/caddy/templates/_helpers.tpl b/caddy/templates/_helpers.tpl deleted file mode 100644 index b42bfa2..0000000 --- a/caddy/templates/_helpers.tpl +++ /dev/null @@ -1,75 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "caddy.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 "caddy.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 "caddy.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "caddy.labels" -}} -helm.sh/chart: {{ include "caddy.chart" . }} -{{ include "caddy.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "caddy.selectorLabels" -}} -app.kubernetes.io/name: {{ include "caddy.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "caddy.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "caddy.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} - -{{/* -Determine the configuration file name based on the adapter. -*/}} -{{- define "caddy.configFileName" -}} -{{- if or (not .Values.config) (eq .Values.adapter "caddyfile") }} -{{- print "Caddyfile" }} -{{- else if .Values.adapter }} -{{- printf "config.%s" .Values.adapter }} -{{- else }} -{{- print "config.json" }} -{{- end }} -{{- end }} diff --git a/caddy/templates/configmap.yaml b/caddy/templates/configmap.yaml deleted file mode 100644 index 650b1b4..0000000 --- a/caddy/templates/configmap.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if .Values.config -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "caddy.fullname" . }} - labels: - {{- include "caddy.labels" . | nindent 4 }} -data: - {{ include "caddy.configFileName" . }}: |- - {{- .Values.config | nindent 4 }} -{{- end }} diff --git a/caddy/templates/deployment.yaml b/caddy/templates/deployment.yaml deleted file mode 100644 index 170c93d..0000000 --- a/caddy/templates/deployment.yaml +++ /dev/null @@ -1,105 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "caddy.fullname" . }} - labels: - {{- include "caddy.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "caddy.selectorLabels" . | nindent 6 }} - template: - metadata: - annotations: - {{- if not .Values.watch }} - checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} - {{- end }} - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "caddy.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "caddy.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: - - caddy - - run - - --config - - /etc/caddy/{{ include "caddy.configFileName" . }} - {{- if and .Values.config .Values.adapter }} - - --adapter - - {{ .Values.adapter }} - {{- end }} - {{- if .Values.watch }} - - --watch - {{- end }} - {{- with .Values.env }} - env: - {{- range $key, $value := . }} - - name: {{ $key }} - value: {{ $value | quote }} - {{- end }} - {{- end }} - {{- with .Values.envFrom }} - envFrom: - {{- toYaml . | nindent 12 }} - {{- end }} - ports: - - name: http - containerPort: 80 - protocol: TCP - livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} - readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- if or .Values.config .Values.volumeMounts }} - volumeMounts: - {{- if .Values.config }} - - name: config - mountPath: /etc/caddy - readOnly: true - {{- end }} - {{- with .Values.volumeMounts }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- end }} - {{- if or .Values.config .Values.volumes }} - volumes: - {{- if .Values.config }} - - name: config - configMap: - name: {{ include "caddy.fullname" . }} - {{- end }} - {{- with .Values.volumes }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- end }} - {{- 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/caddy/templates/hpa.yaml b/caddy/templates/hpa.yaml deleted file mode 100644 index b53edaa..0000000 --- a/caddy/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "caddy.fullname" . }} - labels: - {{- include "caddy.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "caddy.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/caddy/templates/ingress.yaml b/caddy/templates/ingress.yaml deleted file mode 100644 index a919a2c..0000000 --- a/caddy/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "caddy.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else 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 "caddy.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- 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 }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/caddy/templates/service.yaml b/caddy/templates/service.yaml deleted file mode 100644 index 72e0f82..0000000 --- a/caddy/templates/service.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "caddy.fullname" . }} - labels: - {{- include "caddy.labels" . | nindent 4 }} - {{- with .Values.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.service.type }} - {{- with .Values.service.externalTrafficPolicy }} - externalTrafficPolicy: {{ . }} - {{- end }} - {{- if eq .Values.service.type "LoadBalancer" }} - {{- with .Values.service.loadBalancerIP }} - loadBalancerIP: {{ . }} - {{- end }} - {{- with .Values.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: {{ toYaml . | nindent 4 }} - {{- end }} - {{- end }} - ports: - - name: http - port: {{ .Values.service.port }} - {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) .Values.service.nodePort }} - nodePort: {{ .Values.service.nodePort }} - {{- end }} - targetPort: http - protocol: TCP - {{- if semverCompare ">=1.20-0" .Capabilities.KubeVersion.GitVersion }} - appProtocol: http - {{- end }} - selector: - {{- include "caddy.selectorLabels" . | nindent 4 }} diff --git a/caddy/templates/serviceaccount.yaml b/caddy/templates/serviceaccount.yaml deleted file mode 100644 index 94e0bf9..0000000 --- a/caddy/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "caddy.serviceAccountName" . }} - labels: - {{- include "caddy.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/caddy/templates/tests/test-connection.yaml b/caddy/templates/tests/test-connection.yaml deleted file mode 100644 index 047394a..0000000 --- a/caddy/templates/tests/test-connection.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "caddy.fullname" . }}-test-connection" - labels: - {{- include "caddy.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: - - /bin/sh - - -c - - | - sleep 10 # Readiness takes some time - wget {{ include "caddy.fullname" . }}:{{ .Values.service.port }} - restartPolicy: Never diff --git a/caddy/values.yaml b/caddy/values.yaml deleted file mode 100644 index cdbd1c5..0000000 --- a/caddy/values.yaml +++ /dev/null @@ -1,180 +0,0 @@ -# Default values for caddy. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -# -- Number of replicas (pods) to launch. -replicaCount: 1 - -image: - # -- Name of the image repository to pull the container image from. - repository: caddyl4 - - # -- [Image pull policy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) for updating already existing images on a node. - pullPolicy: IfNotPresent - - # -- Image tag override for the default value (chart appVersion). - tag: "" - -# -- Reference to one or more secrets to be used when [pulling images](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) (from private registries). -imagePullSecrets: [] - -# -- A name in place of the chart name for `app:` labels. -nameOverride: "" - -# -- A name to substitute for the full names of resources. -fullnameOverride: "" - -# -- (string) Caddy configuration file content. Accepts [Caddyfile](https://caddyserver.com/docs/caddyfile) format by default. -# See `adapter` for other formats. -config: - -# -- Caddyfile [config adapter](https://caddyserver.com/docs/config-adapters). Set it to empty string to use JSON. -adapter: caddyfile - -# -- Watch config file for changes and reload it automatically. -watch: false - -# -- Additional storage [volumes](https://kubernetes.io/docs/concepts/storage/volumes/). -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1) for details. -volumes: [] - -# -- Additional [volume mounts](https://kubernetes.io/docs/tasks/configure-pod-container/configure-volume-storage/). -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1) for details. -volumeMounts: [] - -# -- Additional environment variables mounted from [secrets](https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-environment-variables) or [config maps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables). -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#environment-variables) for details. -envFrom: [] - -# -- Additional environment variables passed directly to containers. -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#environment-variables) for details. -env: {} - -serviceAccount: - # -- Enable service account creation. - create: true - - # -- Annotations to be added 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: "" - -# -- Annotations to be added to pods. -podAnnotations: {} - -# -- Pod [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod). -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context) for details. -podSecurityContext: {} - # fsGroup: 2000 - -# -- Container [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container). -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) for details. -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - # -- Annotations to be added to the service. - annotations: {} - - # -- Kubernetes [service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types). - type: ClusterIP - - # -- (string) Only applies when the service type is LoadBalancer. Load balancer will get created with the IP specified in this field. - loadBalancerIP: - - # -- (list) If specified (and supported by the cloud provider), traffic through the load balancer will be restricted to the specified client IPs. - # Valid values are IP CIDR blocks. - loadBalancerSourceRanges: [] - - # -- Service port. - port: 80 - - # -- (int) Service node port (when applicable). - nodePort: - - # -- Route external traffic to node-local or cluster-wide endoints. - # Useful for [preserving the client source IP](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip). - externalTrafficPolicy: - -ingress: - # -- Enable [ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/). - enabled: false - - # -- Ingress [class name](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class). - className: "" - - # -- Annotations to be added to the ingress. - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - - # -- Ingress host configuration. - # @default -- See [values.yaml](values.yaml). - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - - # -- Ingress TLS configuration. - # @default -- See [values.yaml](values.yaml). - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -# -- Container resource [requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/). -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources) for details. -# @default -- No requests or limits. -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 configuration (see [values.yaml](values.yaml) for details). -# @default -- Disabled by default. -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -# -- [Node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) configuration. -nodeSelector: {} - -# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for node taints. -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling) for details. -tolerations: [] - -# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) configuration. -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling) for details. -affinity: {} - -# -- [Liveness probe](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Probe) for details. -livenessProbe: - httpGet: - path: / - port: http - -# -- [Readiness probe](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) -# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Probe) for details. -readinessProbe: - httpGet: - path: / - port: http diff --git a/cassandra/Chart.yaml b/cassandra/Chart.yaml index ca48e94..5013008 100644 --- a/cassandra/Chart.yaml +++ b/cassandra/Chart.yaml @@ -18,7 +18,7 @@ dependencies: version: 2.x.x description: Apache Cassandra is an open source distributed database management system designed to handle large amounts of data across many servers, providing high availability - with no single point of failure. And lets test it. Now. + with no single point of failure. home: https://bitnami.com icon: https://dyltqmyl993wv.cloudfront.net/assets/stacks/cassandra/img/cassandra-stack-220x234.png keywords: diff --git a/cassandra/values.yaml b/cassandra/values.yaml index add0d9e..0d4c31a 100644 --- a/cassandra/values.yaml +++ b/cassandra/values.yaml @@ -120,7 +120,7 @@ image: dbUser: user: cassandra forcePassword: false - password: "tnQ5jUwRv2I" + password: "" ## Use an existing secrets which already stores your password data. ## for backwards compatibility, existingSecret can be a simple string, ## referencing the secret by name.