From 399126c96e6aad4d90ad08e1eb3dc6a77c1abde8 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Tue, 18 Oct 2022 13:40:45 +0200 Subject: [PATCH] chart is obsoleted now (#197) --- charts/opsgenie-marid/.helmignore | 22 --- charts/opsgenie-marid/Chart.yaml | 13 -- charts/opsgenie-marid/README.md | 64 -------- charts/opsgenie-marid/templates/NOTES.txt | 21 --- charts/opsgenie-marid/templates/_helpers.tpl | 45 ------ .../opsgenie-marid/templates/configmap.yaml | 10 -- .../opsgenie-marid/templates/deployment.yaml | 105 ------------- charts/opsgenie-marid/templates/ingress.yaml | 36 ----- charts/opsgenie-marid/templates/secret.yaml | 11 -- charts/opsgenie-marid/templates/service.yaml | 16 -- charts/opsgenie-marid/values.yaml | 145 ------------------ 11 files changed, 488 deletions(-) delete mode 100644 charts/opsgenie-marid/.helmignore delete mode 100644 charts/opsgenie-marid/Chart.yaml delete mode 100644 charts/opsgenie-marid/README.md delete mode 100644 charts/opsgenie-marid/templates/NOTES.txt delete mode 100644 charts/opsgenie-marid/templates/_helpers.tpl delete mode 100644 charts/opsgenie-marid/templates/configmap.yaml delete mode 100644 charts/opsgenie-marid/templates/deployment.yaml delete mode 100644 charts/opsgenie-marid/templates/ingress.yaml delete mode 100644 charts/opsgenie-marid/templates/secret.yaml delete mode 100644 charts/opsgenie-marid/templates/service.yaml delete mode 100644 charts/opsgenie-marid/values.yaml diff --git a/charts/opsgenie-marid/.helmignore b/charts/opsgenie-marid/.helmignore deleted file mode 100644 index 50af031..0000000 --- a/charts/opsgenie-marid/.helmignore +++ /dev/null @@ -1,22 +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 -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/opsgenie-marid/Chart.yaml b/charts/opsgenie-marid/Chart.yaml deleted file mode 100644 index 87ed81b..0000000 --- a/charts/opsgenie-marid/Chart.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v2 -appVersion: "v2.15.0" -description: "NOTE: This chart is deprecated due to marid being retired: https://community.atlassian.com/t5/Opsgenie-articles/Opsgenie-s-Marid-integration-server-is-being-retired-Action/ba-p/2038354" -deprecated: true -name: opsgenie-marid -version: 0.2.7 -icon: https://wac-cdn.atlassian.com/dam/jcr:8dbf0e36-5b84-4205-8dcb-3f7e94240ae7/marid-logo@2x.png?cdnVersion=565 -home: https://docs.opsgenie.com/docs/marid-integration-server-for-opsgenie -keywords: -- monitoring -- alerting -- opsgenie -- marid diff --git a/charts/opsgenie-marid/README.md b/charts/opsgenie-marid/README.md deleted file mode 100644 index 0542fa0..0000000 --- a/charts/opsgenie-marid/README.md +++ /dev/null @@ -1,64 +0,0 @@ -# opsgenie-marid - -![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![AppVersion: v2.15.0](https://img.shields.io/badge/AppVersion-v2.15.0-informational?style=flat-square) - -A Helm chart for Kubernetes - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| davidkarlsen | | | - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| affinity | object | `{}` | | -| configmap."marid.conf" | string | `"apiKey = YOUR_API_KEY\n#if you are using opsgenie from another domain e.g. eu, sandbox etc.\n#you should update the line below\nopsgenie.api.url = https://api.opsgenie.com\n######################################## MARID CONFIGURATION ##################################################\n\n######################################## PROXY SERVER CONFIGURATION ############################################\n#http.proxy.server.enabled=false\n#http.proxy.server.port=11111\n#http.proxy.server.host=localhost\n#http.proxy.server.username=admin\n#http.proxy.server.password=changeme\n\n######################################## PROXY CONFIGURATION FOR EXTERNAL HTTP REQUESTS FROM MARID##############\n#http.proxy.enabled=false\n#http.proxy.host=\n#http.proxy.port=\n#http.proxy.username=\n#http.proxy.password=\n#http.proxy.protocol=\n#http.proxy.authMethod=\n\n######################################## HTTP SERVER CONFIGURATION ############################################\n#maridKey=changeme\n#http.server.enabled=true\n#http.server.host=localhost\n#http.server.port=8080\n#http.server.maxContentLength=2000000\n\n#async.script.shutdown.wait.time=90000\n#async.script.executor.thread.count=20\n#async.script.executor.queue.count=10000\n\n######################################## HTTPS SERVER CONFIGURATION ############################################\n#https.server.enabled=true\n#https.server.host=localhost\n#https.server.port=8443\n#https.server.maxContentLength=2000000\n\n#######################################ALERT ACTION SCRIPT CONFIGURATION #####################################\n#actions..script=\n##############################################################################################################\n"` | | -| env | list | `[]` | | -| fullnameOverride | string | `""` | | -| gitSync.branch | string | `"master"` | | -| gitSync.enabled | bool | `false` | | -| gitSync.env | list | `[]` | | -| gitSync.extraArgs[0] | string | `"-ssh"` | | -| gitSync.extraArgs[1] | string | `"-dest=scripts"` | | -| gitSync.extraArgs[2] | string | `"-depth=1"` | | -| gitSync.extraArgs[3] | string | `"-wait=60"` | | -| gitSync.extraArgs[4] | string | `"-ssh-known-hosts=false"` | | -| gitSync.extraArgs[5] | string | `"-logtostderr"` | | -| gitSync.extraArgs[6] | string | `"-v=9"` | | -| gitSync.image.pullPolicy | string | `"IfNotPresent"` | | -| gitSync.image.repository | string | `"k8s.gcr.io/git-sync/git-sync"` | | -| gitSync.image.tag | string | `"v3.6.0"` | | -| gitSync.knownHosts | string | `""` | | -| gitSync.resources | object | `{}` | | -| gitSync.securityContext.allowPrivilegeEscalation | bool | `false` | | -| gitSync.securityContext.runAsNonRoot | bool | `true` | | -| gitSync.securityContext.runAsUser | int | `65533` | | -| gitSync.sshKey | string | `""` | | -| image.pullPolicy | string | `"IfNotPresent"` | | -| image.repository | string | `"quay.io/evryfs/docker-marid"` | | -| image.tag | string | `"v2.15.0-8"` | | -| imagePullSecrets | list | `[]` | | -| ingress.annotations | object | `{}` | | -| ingress.enabled | bool | `false` | | -| ingress.hosts[0].host | string | `"chart-example.local"` | | -| ingress.hosts[0].paths | list | `[]` | | -| ingress.tls | list | `[]` | | -| nameOverride | string | `""` | | -| nodeSelector | object | `{}` | | -| podSecurityContext.fsGroup | int | `65533` | | -| replicaCount | int | `1` | | -| resources | object | `{}` | | -| securityContext.allowPrivilegeEscalation | bool | `false` | | -| securityContext.runAsNonRoot | bool | `true` | | -| securityContext.runAsUser | int | `999` | | -| service.port | int | `80` | | -| service.type | string | `"ClusterIP"` | | -| tolerations | list | `[]` | | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/opsgenie-marid/templates/NOTES.txt b/charts/opsgenie-marid/templates/NOTES.txt deleted file mode 100644 index 866cdae..0000000 --- a/charts/opsgenie-marid/templates/NOTES.txt +++ /dev/null @@ -1,21 +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 }}{{ . }} - {{- 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 "opsgenie-marid.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 "opsgenie-marid.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "opsgenie-marid.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 "opsgenie-marid.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 }} diff --git a/charts/opsgenie-marid/templates/_helpers.tpl b/charts/opsgenie-marid/templates/_helpers.tpl deleted file mode 100644 index 30f740f..0000000 --- a/charts/opsgenie-marid/templates/_helpers.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "opsgenie-marid.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 "opsgenie-marid.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 "opsgenie-marid.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "opsgenie-marid.labels" -}} -app.kubernetes.io/name: {{ include "opsgenie-marid.name" . }} -helm.sh/chart: {{ include "opsgenie-marid.chart" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} diff --git a/charts/opsgenie-marid/templates/configmap.yaml b/charts/opsgenie-marid/templates/configmap.yaml deleted file mode 100644 index 43d12d0..0000000 --- a/charts/opsgenie-marid/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- if .Values.configmap -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "opsgenie-marid.fullname" . }} - labels: -{{ include "opsgenie-marid.labels" . | indent 4 }} -data: -{{ toYaml .Values.configmap | indent 2 }} -{{- end }} diff --git a/charts/opsgenie-marid/templates/deployment.yaml b/charts/opsgenie-marid/templates/deployment.yaml deleted file mode 100644 index 0b8b84c..0000000 --- a/charts/opsgenie-marid/templates/deployment.yaml +++ /dev/null @@ -1,105 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "opsgenie-marid.fullname" . }} - labels: {{ include "opsgenie-marid.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "opsgenie-marid.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "opsgenie-marid.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 6 }} - {{- end }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - securityContext: {{ .Values.securityContext | toYaml | nindent 12 }} - {{- if .Values.env }} - env: - {{ toYaml .Values.env | nindent 12 }} - {{- end }} - ports: - - name: http - containerPort: 80 - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - {{- if hasKey .Values.configmap "log4j.properties" }} - - name: config - mountPath: /etc/opsgenie/marid/log.properties - subPath: log4j.properties - {{- end }} - {{- if hasKey .Values.configmap "marid.conf" }} - - name: config - mountPath: /etc/opsgenie/marid/marid.conf - subPath: marid.conf - {{- end }} - {{- if .Values.gitSync.enabled }} - - name: scripts - mountPath: /var/opsgenie/marid - {{- end }} - {{- if .Values.gitSync.enabled }} - - name: git-sync - image: {{ .Values.gitSync.image.repository }}:{{ .Values.gitSync.image.tag }} - imagePullPolicy: {{ .Values.gitSync.image.pullPolicy }} - args: - - "-repo={{ .Values.gitSync.url }}" - - "-branch={{ .Values.gitSync.branch }}" - {{- toYaml .Values.gitSync.extraArgs | nindent 10 }} - resources: - {{- toYaml .Values.gitSync.resources | nindent 12 }} - volumeMounts: - - name: git-secret - mountPath: /etc/git-secret - - name: scripts - mountPath: /workspace - {{- if hasKey .Values.configmap "sshConfig" }} - - name: config - mountPath: /tmp/.ssh/config - readOnly: true - subPath: sshConfig - {{- end }} - securityContext: {{ .Values.gitSync.securityContext | toYaml | nindent 12 }} - env: - {{- toYaml .Values.gitSync.env | nindent 12 }} - {{- end }} - volumes: - {{- if .Values.configmap }} - - name: config - configMap: - name: {{ include "opsgenie-marid.fullname" . }} - {{- end }} - {{- if .Values.gitSync.sshKey }} - - name: git-secret - secret: - secretName: {{ include "opsgenie-marid.fullname" . }}-sshkey - defaultMode: 256 #0440 - - name: scripts - emptyDir: {} - {{- end }} - {{- with .Values.podSecurityContext }} - securityContext: {{ . | toYaml | nindent 8 }} - {{- 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/charts/opsgenie-marid/templates/ingress.yaml b/charts/opsgenie-marid/templates/ingress.yaml deleted file mode 100644 index 7e8c083..0000000 --- a/charts/opsgenie-marid/templates/ingress.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "opsgenie-marid.fullname" . -}} -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: -{{ include "opsgenie-marid.labels" . | indent 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: {{ . }} - backend: - serviceName: {{ $fullName }} - servicePort: http - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/opsgenie-marid/templates/secret.yaml b/charts/opsgenie-marid/templates/secret.yaml deleted file mode 100644 index 4fc6cd8..0000000 --- a/charts/opsgenie-marid/templates/secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if .Values.gitSync.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "opsgenie-marid.fullname" . }}-sshkey - labels: -{{ include "opsgenie-marid.labels" . | indent 4 }} -data: - ssh: {{ .Values.gitSync.sshKey | b64enc }} - known_hosts: {{ .Values.gitSync.knownHosts | b64enc }} -{{- end }} diff --git a/charts/opsgenie-marid/templates/service.yaml b/charts/opsgenie-marid/templates/service.yaml deleted file mode 100644 index 240b42f..0000000 --- a/charts/opsgenie-marid/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "opsgenie-marid.fullname" . }} - labels: -{{ include "opsgenie-marid.labels" . | indent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - app.kubernetes.io/name: {{ include "opsgenie-marid.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/opsgenie-marid/values.yaml b/charts/opsgenie-marid/values.yaml deleted file mode 100644 index f3dc288..0000000 --- a/charts/opsgenie-marid/values.yaml +++ /dev/null @@ -1,145 +0,0 @@ -# Default values for opsgenie-marid. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: quay.io/evryfs/docker-marid - tag: v2.15.0-8 - pullPolicy: IfNotPresent - -podSecurityContext: - fsGroup: 65533 - -securityContext: - runAsUser: 999 - allowPrivilegeEscalation: false - runAsNonRoot: true -gitSync: - securityContext: - allowPrivilegeEscalation: false - runAsNonRoot: true - # git-sync user - runAsUser: 65533 - enabled: false - image: - repository: k8s.gcr.io/git-sync/git-sync - tag: v3.6.0 - pullPolicy: IfNotPresent - sshKey: "" - knownHosts: "" - branch: master - env: [] - resources: {} - extraArgs: - - "-ssh" - - "-dest=scripts" - - "-depth=1" - - "-wait=60" - - "-ssh-known-hosts=false" - - "-logtostderr" - - "-v=9" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: [] - - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -# environment values for Opsgenie Marid container -env: [] - -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 - -configmap: - marid.conf: | - apiKey = YOUR_API_KEY - #if you are using opsgenie from another domain e.g. eu, sandbox etc. - #you should update the line below - opsgenie.api.url = https://api.opsgenie.com - ######################################## MARID CONFIGURATION ################################################## - - ######################################## PROXY SERVER CONFIGURATION ############################################ - #http.proxy.server.enabled=false - #http.proxy.server.port=11111 - #http.proxy.server.host=localhost - #http.proxy.server.username=admin - #http.proxy.server.password=changeme - - ######################################## PROXY CONFIGURATION FOR EXTERNAL HTTP REQUESTS FROM MARID############## - #http.proxy.enabled=false - #http.proxy.host= - #http.proxy.port= - #http.proxy.username= - #http.proxy.password= - #http.proxy.protocol= - #http.proxy.authMethod= - - ######################################## HTTP SERVER CONFIGURATION ############################################ - #maridKey=changeme - #http.server.enabled=true - #http.server.host=localhost - #http.server.port=8080 - #http.server.maxContentLength=2000000 - - #async.script.shutdown.wait.time=90000 - #async.script.executor.thread.count=20 - #async.script.executor.queue.count=10000 - - ######################################## HTTPS SERVER CONFIGURATION ############################################ - #https.server.enabled=true - #https.server.host=localhost - #https.server.port=8443 - #https.server.maxContentLength=2000000 - - #######################################ALERT ACTION SCRIPT CONFIGURATION ##################################### - #actions..script= - ############################################################################################################## - -# log4j.properties: | -# log4j.rootLogger=INFO, console -# log4j.appender.console=org.apache.log4j.ConsoleAppender -# log4j.appender.console.layout=org.apache.log4j.PatternLayout -# log4j.appender.console.layout.conversionPattern=%d [%t] %-5p %c - %m%n -# log4j.appender.console.encoding=UTF-8 - -# sshConfig: | -# Host github.com -# ProxyCommand socat STDIO PROXY::%h:%p,proxyport= -# User git -# Hostname ssh.github.com -# Port 443 - - -nodeSelector: {} - -tolerations: [] - -affinity: {}