Skip to content

Commit

Permalink
charts name update (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
cicdteam authored Apr 27, 2022
1 parent 895971b commit d854347
Show file tree
Hide file tree
Showing 15 changed files with 103 additions and 103 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Zenithdb Kubernetes Helm Charts
# Neondatabase Kubernetes Helm Charts

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

Expand All @@ -12,23 +12,23 @@ Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
Once Helm is set up properly, add the repo as follows:

```console
helm repo add zenithdb https://zenithdb.github.io/helm-charts
helm repo add neondatabase https://neondatabase.github.io/helm-charts
```

You can then run `helm search repo zenithdb` to see the charts.
You can then run `helm search repo neondatabase` to see the charts.

## Contributing

The source code of all Zenithdb Helm charts can be found on Github: <https://github.com/zenithdb/helm-charts/>
The source code of all Neondatabase Helm charts can be found on Github: <https://github.com/neondatabase/helm-charts/>

<!-- Keep full URL links to repo files because this README syncs from main to gh-pages. -->
We'd love to have you contribute! Please refer to our [contribution guidelines](https://github.com/zenithdb/helm-charts/blob/main/CONTRIBUTING.md) for details.
We'd love to have you contribute! Please refer to our [contribution guidelines](https://github.com/neondatabase/helm-charts/blob/main/CONTRIBUTING.md) for details.

## License

<!-- Keep full URL links to repo files because this README syncs from main to gh-pages. -->
[Apache 2.0 License](https://github.com/zenithdb/helm-charts/blob/main/LICENSE).
[Apache 2.0 License](https://github.com/neondatabase/helm-charts/blob/main/LICENSE).

## Helm charts build status

![Release Charts](https://github.com/zenithdb/helm-charts/workflows/Release%20Charts/badge.svg?branch=main) [![Lint and Test Charts](https://github.com/zenithdb/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/zenithdb/helm-charts/actions/workflows/lint-test.yaml)
![Release Charts](https://github.com/neondatabase/helm-charts/workflows/Release%20Charts/badge.svg?branch=main) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)
File renamed without changes.
10 changes: 10 additions & 0 deletions charts/neon-proxy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v2
name: neon-proxy
description: Neon Proxy
type: application
version: 1.2.2
appVersion: "0.1.0"
kubeVersion: "^1.18.x-x"
home: https://neon.tech
sources:
- https://github.com/neondatabase/neon
32 changes: 16 additions & 16 deletions charts/zenith-proxy/README.md → charts/neon-proxy/README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# zenith-proxy
# neon-proxy

![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/zenithdb/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/zenithdb/helm-charts/actions/workflows/lint-test.yaml)
![Version: 1.2.2](https://img.shields.io/badge/Version-1.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)

Zenith Proxy
Neon Proxy

**Homepage:** https://zenith.tech
**Homepage:** https://neon.tech

## Source Code

* <https://github.com/zenithdb/zenith>
* <https://github.com/neondatabase/neon>

## Installing the Chart

To install the chart with the release name `zenith-proxy`:
To install the chart with the release name `neon-proxy`:

```console
$ helm repo add zenithdb https://zenithdb.github.io/helm-charts
$ helm install zenith-proxy zenithdb/zenith-proxy
$ helm repo add neondatabase https://neondatabase.github.io/helm-charts
$ helm install neon-proxy neondatabase/neon-proxy
```

## Requirements
Expand All @@ -31,9 +31,9 @@ Kubernetes: `^1.18.x-x`
| exposedService.annotations | object | `{}` | Annotations to add to the exposed service |
| exposedService.port | int | `5432` | Exposed Service proxy port |
| exposedService.type | string | `"LoadBalancer"` | Exposed service type |
| fullnameOverride | string | `""` | String to fully override zenith-proxy.fullname template |
| fullnameOverride | string | `""` | String to fully override neon-proxy.fullname template |
| image.pullPolicy | string | `"Always"` | image pull policy |
| image.repository | string | `"zenithdb/zenith"` | Zenithdb image repository |
| image.repository | string | `"neondatabase/neon"` | Neondatabase image repository |
| image.tag | string | `"latest"` | Overrides the image tag whose default is the chart appVersion. |
| imagePullSecrets | list | `[]` | Specify docker-registry secret names as an array |
| metrics.enabled | bool | `false` | Enable prometheus metrcis autodiscovery |
Expand All @@ -42,22 +42,22 @@ Kubernetes: `^1.18.x-x`
| metrics.serviceMonitor.namespace | string | `""` | The namespace in which the ServiceMonitor will be created, if empty then Release.Namespace used |
| metrics.serviceMonitor.scrapeTimeout | string | `"10s"` | Scrape Timeout duration for prometheus |
| metrics.serviceMonitor.selector | object | `{}` | Additional labels to attach (used by Prometheus operator) |
| nameOverride | string | `""` | String to partially override zenith-proxy.fullname template (will maintain the release name) |
| nameOverride | string | `""` | String to partially override neon-proxy.fullname template (will maintain the release name) |
| nodeSelector | object | `{}` | Node labels for pod assignment. |
| podAnnotations | object | `{}` | Annotations for zenith-proxy pods |
| podLabels | object | `{}` | Additional labels for zenith-proxy pods |
| podSecurityContext | object | `{}` | zenith-proxy's pods Security Context |
| podAnnotations | object | `{}` | Annotations for neon-proxy pods |
| podLabels | object | `{}` | Additional labels for neon-proxy pods |
| podSecurityContext | object | `{}` | neon-proxy's pods Security Context |
| replicaCount | int | `1` | |
| resources | object | `{}` | |
| securityContext | object | `{}` | zenith-proxy's containers Security Context |
| securityContext | object | `{}` | neon-proxy's containers Security Context |
| service.annotations | object | `{}` | Annotations to add to the service |
| service.httpPort | int | `9090` | Http management port |
| service.port | int | `7000` | Service management port |
| service.type | string | `"ClusterIP"` | Service type |
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
| serviceAccount.create | bool | `true` | |
| serviceAccount.name | string | `""` | |
| settings.authEndpoint | string | `""` | auth endpoint, e.g. "http://console.zenith/authenticate_proxy_request/" |
| settings.authEndpoint | string | `""` | auth endpoint, e.g. "http://console.neon/authenticate_proxy_request/" |
| settings.uri | string | `""` | |
| tolerations | list | `[]` | Tolerations for pod assignment. |

Expand Down
23 changes: 23 additions & 0 deletions charts/neon-proxy/README.md.gotmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{{ template "chart.header" . }}
{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}[![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)

{{ template "chart.description" . }}

**Homepage:** {{ template "chart.homepage" . }}

{{ template "chart.sourcesSection" . }}

## Installing the Chart

To install the chart with the release name `neon-proxy`:

```console
$ helm repo add neondatabase https://neondatabase.github.io/helm-charts
$ helm install {{ template "chart.name" . }} neondatabase/{{ template "chart.name" . }}
```

{{ template "chart.requirementsSection" . }}

{{ template "chart.valuesSection" . }}

{{ template "helm-docs.versionFooter" . }}
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
1. Get the application URL by running these commands:
{{- if contains "NodePort" .Values.exposedService.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "zenith-proxy.fullname" . }}-exposed)
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "neon-proxy.fullname" . }}-exposed)
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo postgres://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.exposedService.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 "zenith-proxy.fullname" . }}-exposed'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "zenith-proxy.fullname" . }}-exposed --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "neon-proxy.fullname" . }}-exposed'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "neon-proxy.fullname" . }}-exposed --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo postgres://$SERVICE_IP:{{ .Values.exposedService.port }}
{{- else if contains "ClusterIP" .Values.exposedService.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "zenith-proxy.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "neon-proxy.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 postgres://127.0.0.1:15432 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 15432:$CONTAINER_PORT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "zenith-proxy.name" -}}
{{- define "neon-proxy.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}

Expand All @@ -10,7 +10,7 @@ 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 "zenith-proxy.fullname" -}}
{{- define "neon-proxy.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
Expand All @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "zenith-proxy.chart" -}}
{{- define "neon-proxy.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Common labels
*/}}
{{- define "zenith-proxy.labels" -}}
helm.sh/chart: {{ include "zenith-proxy.chart" . }}
{{ include "zenith-proxy.selectorLabels" . }}
{{- define "neon-proxy.labels" -}}
helm.sh/chart: {{ include "neon-proxy.chart" . }}
{{ include "neon-proxy.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
Expand All @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{/*
Selector labels
*/}}
{{- define "zenith-proxy.selectorLabels" -}}
app.kubernetes.io/name: {{ include "zenith-proxy.name" . }}
{{- define "neon-proxy.selectorLabels" -}}
app.kubernetes.io/name: {{ include "neon-proxy.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Create the name of the service account to use
*/}}
{{- define "zenith-proxy.serviceAccountName" -}}
{{- define "neon-proxy.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "zenith-proxy.fullname" .) .Values.serviceAccount.name }}
{{- default (include "neon-proxy.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "zenith-proxy.fullname" . }}
name: {{ include "neon-proxy.fullname" . }}
labels:
{{- include "zenith-proxy.labels" . | nindent 4 }}
{{- include "neon-proxy.labels" . | nindent 4 }}
spec:
strategy:
type: Recreate
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "zenith-proxy.selectorLabels" . | nindent 6 }}
{{- include "neon-proxy.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "zenith-proxy.selectorLabels" . | nindent 8 }}
{{- include "neon-proxy.selectorLabels" . | nindent 8 }}
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand All @@ -27,7 +27,7 @@ spec:
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "zenith-proxy.serviceAccountName" . }}
serviceAccountName: {{ include "neon-proxy.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "zenith-proxy.fullname" . }}-exposed
name: {{ include "neon-proxy.fullname" . }}-exposed
{{- with .Values.exposedService.annotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "zenith-proxy.labels" . | nindent 4 }}
{{- include "neon-proxy.labels" . | nindent 4 }}
spec:
type: {{ .Values.exposedService.type }}
ports:
Expand All @@ -16,4 +16,4 @@ spec:
protocol: TCP
name: proxy
selector:
{{- include "zenith-proxy.selectorLabels" . | nindent 4 }}
{{- include "neon-proxy.selectorLabels" . | nindent 4 }}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "zenith-proxy.fullname" . }}
name: {{ include "neon-proxy.fullname" . }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "zenith-proxy.labels" . | nindent 4 }}
{{- include "neon-proxy.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
Expand All @@ -20,4 +20,4 @@ spec:
protocol: TCP
name: http
selector:
{{- include "zenith-proxy.selectorLabels" . | nindent 4 }}
{{- include "neon-proxy.selectorLabels" . | nindent 4 }}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "zenith-proxy.serviceAccountName" . }}
name: {{ include "neon-proxy.serviceAccountName" . }}
labels:
{{- include "zenith-proxy.labels" . | nindent 4 }}
{{- include "neon-proxy.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "zenith-proxy.fullname" . }}
name: {{ include "neon-proxy.fullname" . }}
labels:
{{- include "zenith-proxy.labels" . | nindent 4 }}
{{- include "neon-proxy.labels" . | nindent 4 }}
{{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
{{ $key }}: {{ $value | quote }}
{{- end }}
Expand All @@ -15,7 +15,7 @@ metadata:
spec:
selector:
matchLabels:
{{- include "zenith-proxy.selectorLabels" . | nindent 6 }}
{{- include "neon-proxy.selectorLabels" . | nindent 6 }}
endpoints:
- port: http
path: /metrics
Expand Down
Loading

0 comments on commit d854347

Please sign in to comment.