Skip to content

Commit

Permalink
rename webtor-web-ui to just web-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
vintikzzz committed Jun 13, 2022
1 parent b1d9086 commit 0e33b63
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 31 deletions.
4 changes: 2 additions & 2 deletions charts/webtor-web-ui/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: "1.0"
description: Webtor Web UI Chart
name: webtor-web-ui
version: 0.1.7
name: web-ui
version: 0.1.8
8 changes: 4 additions & 4 deletions charts/webtor-web-ui/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
{{- 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 "webtor-web-ui.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "web-ui.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 svc -w {{ include "webtor-web-ui.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "webtor-web-ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
You can watch the status of by running 'kubectl get svc -w {{ include "web-ui.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "web-ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
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 "webtor-web-ui.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 "web-ui.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80
{{- end }}
6 changes: 3 additions & 3 deletions charts/webtor-web-ui/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "webtor-web-ui.name" -}}
{{- define "web-ui.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

Expand All @@ -11,7 +11,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 "webtor-web-ui.fullname" -}}
{{- define "web-ui.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
Expand All @@ -27,6 +27,6 @@ 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 "webtor-web-ui.chart" -}}
{{- define "web-ui.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
6 changes: 3 additions & 3 deletions charts/webtor-web-ui/templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "webtor-web-ui.fullname" . }}
name: {{ include "web-ui.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
helm.sh/chart: {{ include "webtor-web-ui.chart" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
helm.sh/chart: {{ include "web-ui.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
data:
Expand Down
12 changes: 6 additions & 6 deletions charts/webtor-web-ui/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "webtor-web-ui.fullname" . }}
name: {{ include "web-ui.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
helm.sh/chart: {{ include "webtor-web-ui.chart" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
helm.sh/chart: {{ include "web-ui.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
linkerd.io/auto-inject: disabled
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
labels:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
volumes:
- name: config-volume
configMap:
name: {{ include "webtor-web-ui.fullname" . }}
name: {{ include "web-ui.fullname" . }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
Expand Down
6 changes: 3 additions & 3 deletions charts/webtor-web-ui/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "webtor-web-ui.fullname" . -}}
{{- $fullName := include "web-ui.fullname" . -}}
{{- $ingressPaths := .Values.ingress.paths -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
helm.sh/chart: {{ include "webtor-web-ui.chart" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
helm.sh/chart: {{ include "web-ui.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.ingress.annotations }}
Expand Down
8 changes: 4 additions & 4 deletions charts/webtor-web-ui/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "webtor-web-ui.fullname" . }}
name: {{ include "web-ui.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
helm.sh/chart: {{ include "webtor-web-ui.chart" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
helm.sh/chart: {{ include "web-ui.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
Expand All @@ -25,5 +25,5 @@ spec:
{{- end }}
{{- end }}
selector:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
8 changes: 4 additions & 4 deletions charts/webtor-web-ui/templates/tests/test-connection.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
kind: Pod
metadata:
name: "{{ include "webtor-web-ui.fullname" . }}-test-connection"
name: "{{ include "web-ui.fullname" . }}-test-connection"
labels:
app.kubernetes.io/name: {{ include "webtor-web-ui.name" . }}
helm.sh/chart: {{ include "webtor-web-ui.chart" . }}
app.kubernetes.io/name: {{ include "web-ui.name" . }}
helm.sh/chart: {{ include "web-ui.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
annotations:
Expand All @@ -14,5 +14,5 @@ spec:
- name: wget
image: busybox
command: ['wget']
args: ['{{ include "webtor-web-ui.fullname" . }}:{{ .Values.service.port }}']
args: ['{{ include "web-ui.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never
4 changes: 2 additions & 2 deletions helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ releases:
- job-cleaner.yaml
- name: web-ui
namespace: webtor
chart: webtor/webtor-web-ui
version: 0.1.7
chart: webtor/web-ui
version: 0.1.8
missingFileHandler: Warn
values:
- image:
Expand Down
10 changes: 10 additions & 0 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,16 @@ entries:
urls:
- https://github.com/webtor-io/helm-charts/releases/download/video-thumbnails-generator-0.1.0/video-thumbnails-generator-0.1.0.tgz
version: 0.1.0
web-ui:
- apiVersion: v1
appVersion: "1.0"
created: "2022-06-13T14:17:02.376156+03:00"
description: Webtor Web UI Chart
digest: d0d0bd413b5561b28f310b5db01f58947e2d513398d729d6803a741563324c93
name: web-ui
urls:
- https://github.com/webtor-io/helm-charts/releases/download/web-ui-0.1.8/web-ui-0.1.8.tgz
version: 0.1.8
webhook:
- apiVersion: v1
appVersion: "1.0"
Expand Down

0 comments on commit 0e33b63

Please sign in to comment.