From 5c41fac1ef6db0123fc36580f8fdb63eaed05f2d Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 14 May 2022 12:05:59 +0200
Subject: [PATCH] feat: update imghost chart, remove asynqmon chart (now
integrated into imghost)
---
.gitlab-ci.yml | 1 -
asynqmon/Chart.yaml | 6 ---
asynqmon/pipeline.yml | 12 -----
asynqmon/templates/_helpers.tpl | 56 --------------------
asynqmon/templates/configmap.yaml | 9 ----
asynqmon/templates/deployment.yaml | 85 ------------------------------
asynqmon/templates/ingress.yaml | 20 -------
asynqmon/templates/secret.yaml | 8 ---
asynqmon/templates/service.yaml | 21 --------
asynqmon/values.yaml | 52 ------------------
imghost/Chart.yaml | 2 +-
11 files changed, 1 insertion(+), 271 deletions(-)
delete mode 100644 asynqmon/Chart.yaml
delete mode 100644 asynqmon/pipeline.yml
delete mode 100644 asynqmon/templates/_helpers.tpl
delete mode 100644 asynqmon/templates/configmap.yaml
delete mode 100644 asynqmon/templates/deployment.yaml
delete mode 100644 asynqmon/templates/ingress.yaml
delete mode 100644 asynqmon/templates/secret.yaml
delete mode 100644 asynqmon/templates/service.yaml
delete mode 100644 asynqmon/values.yaml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 396e931..9ffa9a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ stages:
- release
include:
- actual/pipeline.yml
-- asynqmon/pipeline.yml
- imghost/pipeline.yml
- jellyfin/pipeline.yml
- languagetool/pipeline.yml
diff --git a/asynqmon/Chart.yaml b/asynqmon/Chart.yaml
deleted file mode 100644
index 2cf62c5..0000000
--- a/asynqmon/Chart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v2
-name: asynqmon
-description: Helm Chart for asynqmon
-type: application
-version: 1.0.1
-appVersion: "0.7.1"
diff --git a/asynqmon/pipeline.yml b/asynqmon/pipeline.yml
deleted file mode 100644
index b3aea8d..0000000
--- a/asynqmon/pipeline.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-lint-asynqmon:
- stage: lint
- script:
- - helm lint asynqmon
-
-release-asynqmon:
- stage: release
- script:
- - apk add --no-cache git
- - helm plugin install https://github.com/chartmuseum/helm-push.git
- - helm repo add --username gitlab-ci-token --password $CI_JOB_TOKEN repo ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/stable
- - helm cm-push asynqmon repo
diff --git a/asynqmon/templates/_helpers.tpl b/asynqmon/templates/_helpers.tpl
deleted file mode 100644
index 41eb512..0000000
--- a/asynqmon/templates/_helpers.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "asynqmon-helm.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 "asynqmon-helm.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 "asynqmon-helm.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "asynqmon-helm.labels" -}}
-helm.sh/chart: {{ include "asynqmon-helm.chart" . }}
-{{ include "asynqmon-helm.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "asynqmon-helm.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "asynqmon-helm.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-
-{{- define "asynqmon-helm.sslPath" -}}
-/certs
-{{- end }}
diff --git a/asynqmon/templates/configmap.yaml b/asynqmon/templates/configmap.yaml
deleted file mode 100644
index 25bce1e..0000000
--- a/asynqmon/templates/configmap.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "asynqmon-helm.fullname" . }}
- labels:
- {{- include "asynqmon-helm.labels" . | nindent 4 }}
-data:
- redis-address: "{{ .Values.redis.address }}"
- redis-database: "{{ .Values.redis.database }}"
diff --git a/asynqmon/templates/deployment.yaml b/asynqmon/templates/deployment.yaml
deleted file mode 100644
index 173f15e..0000000
--- a/asynqmon/templates/deployment.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "asynqmon-helm.fullname" . }}
- labels:
- {{- include "asynqmon-helm.labels" . | nindent 4 }}
-spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- {{- include "asynqmon-helm.selectorLabels" . | nindent 6 }}
- template:
- metadata:
- {{- with .Values.podAnnotations }}
- annotations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- labels:
- {{- include "asynqmon-helm.selectorLabels" . | nindent 8 }}
- spec:
- {{- with .Values.imagePullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- 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 }}
- env:
- - name: REDIS_ADDRESS
- valueFrom:
- configMapKeyRef:
- name: {{ include "asynqmon-helm.fullname" . }}
- key: redis-address
- - name: REDIS_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ include "asynqmon-helm.fullname" . }}
- key: redis-password
- - name: REDIS_DATABASE
- valueFrom:
- configMapKeyRef:
- name: {{ include "asynqmon-helm.fullname" . }}
- key: redis-database
- args:
- - "--redis-addr=$(REDIS_ADDRESS)"
- - "--redis-password=$(REDIS_PASSWORD)"
- - "--redis-db=$(REDIS_DATABASE)"
- {{ if .Values.metrics.enabled }}
- - "--enable-metrics-exporter"
- {{ end }}
- ports:
- - name: http
- containerPort: 8080
- protocol: TCP
- startupProbe:
- httpGet:
- path: /
- port: http
- livenessProbe:
- httpGet:
- path: /
- port: http
- readinessProbe:
- httpGet:
- path: /
- port: http
- 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/asynqmon/templates/ingress.yaml b/asynqmon/templates/ingress.yaml
deleted file mode 100644
index 6d5e583..0000000
--- a/asynqmon/templates/ingress.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: {{ include "asynqmon-helm.fullname" . }}
- labels:
- {{- include "asynqmon-helm.labels" . | nindent 4 }}
- annotations:
- {{- .Values.ingress.annotations | toYaml | nindent 4 }}
-spec:
- rules:
- - host: "{{ .Values.ingress.host }}"
- http:
- paths:
- - path: "{{ .Values.ingress.path }}"
- backend:
- service:
- name: {{ include "asynqmon-helm.fullname" . }}
- port:
- name: http
- pathType: Prefix
diff --git a/asynqmon/templates/secret.yaml b/asynqmon/templates/secret.yaml
deleted file mode 100644
index 04e97b6..0000000
--- a/asynqmon/templates/secret.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ include "asynqmon-helm.fullname" . }}
- labels:
- {{- include "asynqmon-helm.labels" . | nindent 4 }}
-stringData:
- redis-password: "{{ .Values.redis.password }}"
diff --git a/asynqmon/templates/service.yaml b/asynqmon/templates/service.yaml
deleted file mode 100644
index bcf3f93..0000000
--- a/asynqmon/templates/service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "asynqmon-helm.fullname" . }}
- {{ if .Values.metrics.enabled }}
- annotations:
- prometheus.io/path: "/metrics"
- prometheus.io/port: "80"
- prometheus.io/scrape: "true"
- {{ end }}
- labels:
- {{- include "asynqmon-helm.labels" . | nindent 4 }}
-spec:
- type: {{ .Values.service.type }}
- ports:
- - port: 80
- targetPort: http
- protocol: TCP
- name: http
- selector:
- {{- include "asynqmon-helm.selectorLabels" . | nindent 4 }}
diff --git a/asynqmon/values.yaml b/asynqmon/values.yaml
deleted file mode 100644
index 4a7b72f..0000000
--- a/asynqmon/values.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-replicaCount: 1
-
-image:
- repository: hibiken/asynqmon
- pullPolicy: IfNotPresent
- tag: ""
-
-imagePullSecrets: [ ]
-nameOverride: ""
-fullnameOverride: ""
-
-redis:
- address: "example.com:6379"
- database: 0
- password: ""
-
-metrics:
- enabled: false
-
-service:
- type: ClusterIP
-
-ingress:
- host: "example.com"
- path: "/"
- annotations: { }
-
-podAnnotations: { }
-
-podSecurityContext:
- fsGroup: 2000
-
-securityContext:
- capabilities:
- drop:
- - ALL
- runAsNonRoot: true
- runAsUser: 1000
-
-resources:
- limits:
- cpu: 500m
- memory: 512Mi
- requests:
- cpu: 10m
- memory: 64Mi
-
-nodeSelector: { }
-
-tolerations: [ ]
-
-affinity: { }
diff --git a/imghost/Chart.yaml b/imghost/Chart.yaml
index efb4260..f574c8e 100644
--- a/imghost/Chart.yaml
+++ b/imghost/Chart.yaml
@@ -3,4 +3,4 @@ name: imghost
description: Helm Chart for imghost
type: application
version: 1.0.2
-appVersion: "b05ab1e2"
+appVersion: "d7c3db94"
--
GitLab