From e6f322c1892c2daf2a873b3b55d1736e8a697107 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 21 Apr 2023 14:48:32 -0400 Subject: [PATCH] clean up --- .vscode/settings.json | 9 +- k8s/apps/kerberos/Chart.yaml | 7 -- .../kerberos/templates/deployment-agent.yaml | 81 ------------- .../templates/deployment-factory.yaml | 108 ------------------ .../templates/secrets-common-configs.yaml | 10 -- k8s/apps/kerberos/values-dev.yaml | 0 k8s/apps/kerberos/values-prod.yaml | 0 k8s/apps/kerberos/values.yaml | 17 --- k8s/argoapps/chart-values/mongodb.yaml | 32 ------ k8s/argoapps/values.yaml | 50 +------- 10 files changed, 2 insertions(+), 312 deletions(-) delete mode 100644 k8s/apps/kerberos/Chart.yaml delete mode 100644 k8s/apps/kerberos/templates/deployment-agent.yaml delete mode 100644 k8s/apps/kerberos/templates/deployment-factory.yaml delete mode 100644 k8s/apps/kerberos/templates/secrets-common-configs.yaml delete mode 100644 k8s/apps/kerberos/values-dev.yaml delete mode 100644 k8s/apps/kerberos/values-prod.yaml delete mode 100644 k8s/apps/kerberos/values.yaml delete mode 100644 k8s/argoapps/chart-values/mongodb.yaml diff --git a/.vscode/settings.json b/.vscode/settings.json index 797bf44..9e26dfe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1 @@ -{ - "yaml.schemas": { - "https://json.schemastore.org/helmfile.json": [ - "file:///workspaces/homelab/k8s/argocd/templates/configurations.yaml", - "file:///Users/asosnovsky/git/personal/homelab/k8s/apps/kerberos/templates/deployment-agent-volume.yaml" - ] - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/k8s/apps/kerberos/Chart.yaml b/k8s/apps/kerberos/Chart.yaml deleted file mode 100644 index 789f8d0..0000000 --- a/k8s/apps/kerberos/Chart.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v2 -name: kerberos -description: An apps service for homelab -type: application -version: 0.1.0 -appVersion: "1.0.669719463" -dependencies: [] diff --git a/k8s/apps/kerberos/templates/deployment-agent.yaml b/k8s/apps/kerberos/templates/deployment-agent.yaml deleted file mode 100644 index 4912b2c..0000000 --- a/k8s/apps/kerberos/templates/deployment-agent.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{ range $camera := .Values.cameras }} - -{{ $cameraSlug := ($camera.name | replace " " "-" | lower )}} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $cameraSlug }}-config -data: - AGENT_NAME: "{{ $camera.name }}" - AGENT_KEY: "{{ $cameraSlug }}" - AGENT_TIMEZONE: "{{ $.Values.global.timezone }}" - AGENT_AUTO_CLEAN_MAX_SIZE: "250" #MB - AGENT_CAPTURE_IPCAMERA_RTSP: "{{ $camera.rtsp.url_main }}" - AGENT_CAPTURE_IPCAMERA_SUB_RTSP: "{{ $camera.rtsp.url_sub }}" - AGENT_CAPTURE_CONTINUOUS: "true" - AGENT_CAPTURE_MAXLENGTH: "120" #seconds - {{ if $.Values.common.mqtt }} - AGENT_MQTT_URI: "{{ $.Values.common.mqtt.uri }}" - AGENT_MQTT_USERNAME: "{{ $.Values.common.mqtt.username }}" - AGENT_MQTT_PASSWORD: "{{ $.Values.common.mqtt.password }}" - {{ end }} - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $cameraSlug }}-deployment -spec: - selector: - matchLabels: - kerberos/app: {{ $cameraSlug }}-app - replicas: 1 - template: - metadata: - labels: - kerberos/app: {{ $cameraSlug }}-app - spec: - volumes: - - name: kerberos-data - persistentVolumeClaim: - claimName: {{ $.Values.common.storageClaimName }} - containers: - - name: agent - image: "kerberos/agent:{{ $.Chart.AppVersion }}" - resources: - {{- $.Values.common.resources | toYaml | nindent 14 }} - envFrom: - - secretRef: - name: agent-secret-envs - - configMapRef: - name: {{ $cameraSlug }}-config - volumeMounts: - # - name: kerberos-data - # mountPath: /home/agent/data/config - # subPath: {{ $cameraSlug }}/config - - name: kerberos-data - mountPath: /home/agent/data/recordings - subPath: {{ $cameraSlug }}/recordings - - name: kerberos-data - mountPath: /home/agent/data/snapshots - subPath: {{ $cameraSlug }}/snapshots - # - name: kerberos-data - # mountPath: /home/agent/data/cloud - # subPath: {{ $cameraSlug }}/cloud - ports: - - containerPort: 80 - protocol: TCP ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ $cameraSlug }} -spec: - selector: - kerberos/app: {{ $cameraSlug }}-app - ports: - - port: 80 - targetPort: 80 - -{{ end }} \ No newline at end of file diff --git a/k8s/apps/kerberos/templates/deployment-factory.yaml b/k8s/apps/kerberos/templates/deployment-factory.yaml deleted file mode 100644 index 2539000..0000000 --- a/k8s/apps/kerberos/templates/deployment-factory.yaml +++ /dev/null @@ -1,108 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: factory-creds - annotations: - secret-generator.v1.mittwald.de/autogenerate: KERBEROS_LOGIN_PASSWORD -type: Opaque -data: - KERBEROS_LOGIN_USERNAME: {{ "kerbos" | b64enc }} - ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: "mongodb-secret" -spec: - refreshInterval: 1h - secretStoreRef: - kind: ClusterSecretStore - name: {{ .Values.mongodb.secret.store }} - target: - name: "factory-creds" - creationPolicy: Merge - data: - - secretKey: "MONGODB_DATABASE_CREDENTIALS" - remoteRef: - key: {{ .Values.mongodb.secret.name }} - property: {{ .Values.mongodb.secret.keys.credentials }} - - secretKey: "MONGODB_USERNAME" - remoteRef: - key: {{ .Values.mongodb.secret.name }} - property: {{ .Values.mongodb.secret.keys.username }} - - secretKey: "MONGODB_PASSWORD" - remoteRef: - key: {{ .Values.mongodb.secret.name }} - property: {{ .Values.mongodb.secret.keys.password }} - - secretKey: "MONGODB_DATABASE_STORAGE" - remoteRef: - key: {{ .Values.mongodb.secret.name }} - property: {{ .Values.mongodb.secret.keys.storage }} - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: factory-config -data: - NAMESPACE: {{ .Release.Namespace }} - KERBEROS_AGENT_IMAGE: "kerberos/agent:{{ .Values.agent.version }}" - KERBEROS_AGENT_MEMORY_LIMIT: {{ .Values.agent.memory }} - FACTORY_ENVIRONMENT: "kubernetes" - K8S_PROXY: http://localhost:8082 - FACTORY_API_URL: "api.kerberos.{{ .Values.global.domain }}" - MONGODB_HOST: {{ .Values.mongodb.host }} ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: factory -spec: - replicas: 1 - selector: - matchLabels: - kerberos/app: factory - minReadySeconds: 10 - strategy: - type: RollingUpdate - rollingUpdate: - maxUnavailable: 1 - maxSurge: 1 - template: - metadata: - labels: - kerberos/app: factory - spec: - containers: - - name: factory - image: "kerberos/factory:{{ $.Chart.AppVersion }}" - ports: - - containerPort: 80 - - containerPort: 8082 - envFrom: - - configMapRef: - name: factory-config - - secretRef: - name: factory-creds - ---- -apiVersion: v1 -kind: Service -metadata: - name: factory - labels: - kerberos/app: factory -spec: - ports: - - port: 80 - targetPort: 80 - name: frontend - protocol: TCP - - port: 8082 - name: backend - targetPort: 8082 - protocol: TCP - selector: - kerberos/app: factory - diff --git a/k8s/apps/kerberos/templates/secrets-common-configs.yaml b/k8s/apps/kerberos/templates/secrets-common-configs.yaml deleted file mode 100644 index 2cf6ce9..0000000 --- a/k8s/apps/kerberos/templates/secrets-common-configs.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: agent-secret-envs - annotations: - secret-generator.v1.mittwald.de/autogenerate: AGENT_PASSWORD -type: Opaque -data: - AGENT_USERNAME: {{ "kerbos" | b64enc }} - diff --git a/k8s/apps/kerberos/values-dev.yaml b/k8s/apps/kerberos/values-dev.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/k8s/apps/kerberos/values-prod.yaml b/k8s/apps/kerberos/values-prod.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/k8s/apps/kerberos/values.yaml b/k8s/apps/kerberos/values.yaml deleted file mode 100644 index 538ae7b..0000000 --- a/k8s/apps/kerberos/values.yaml +++ /dev/null @@ -1,17 +0,0 @@ -global: - domain: "change.me" - -agent: - version: "9d70778" - memory: "256Mi" - -mongodb: - host: "?" - secret: - store: "?" - name: "?" - keys: - credentials: "?" - username: "?" - password: "?" - storage: "?" \ No newline at end of file diff --git a/k8s/argoapps/chart-values/mongodb.yaml b/k8s/argoapps/chart-values/mongodb.yaml deleted file mode 100644 index 94e32e7..0000000 --- a/k8s/argoapps/chart-values/mongodb.yaml +++ /dev/null @@ -1,32 +0,0 @@ -architecture: replicaset - -replicaCount: 1 - -auth: - enabled: true - existingSecret: "{{ .Values.secrets.mongodb.secrets.auth.name }}" - -persistence: - enabled: true - resourcePolicy: "keep" - storageClass: {{ .Values.global.nfs.storageClass }} - -resources: - limits: - cpu: 3 - memory: 3Gi - requests: - cpu: 0.5 - memory: 1Gi - -affinity: - nodeAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - preference: - matchExpressions: - - key: homelab/capacity - operator: In - values: - - med - - low \ No newline at end of file diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 7ea1d37..c501b3c 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -147,14 +147,6 @@ apps: port: {{ $v.ports.tcp.web }} middleware: "apps-ingresses-chain-authelia" {{- end }} - # - prefix: "kerberos" - # service: "factory" - # namespace: "apps-kerberos" - # port: 80 - # - prefix: "api.kerberos" - # service: "factory" - # namespace: "apps-kerberos" - # port: 8082 - prefix: "frigate" service: "frigate" namespace: "chart-frigate" @@ -178,22 +170,6 @@ apps: authelia: valuesFile: authelia.yaml - kerberos: - values: |- - common: - storageClaimName: {{ .Values.storage.kerberos.name }} - - mongodb: - host: "mongodb.chart-mongodb.svc.cluster.local" - secret: - store: "mongodb" - name: "mongo.password" - keys: - credentials: "?" - username: "" - password: "mongodb-root-password" - storage: "?" - infrastructureCharts: cert-manager: repoURL: "https://charts.jetstack.io" @@ -223,11 +199,6 @@ infrastructureCharts: repoURL: "https://charts.bitnami.com/bitnami" targetRevision: "12.1.8" valuesFile: database.yaml - mongodb: - repoURL: "https://charts.bitnami.com/bitnami" - chart: "mongodb" - targetRevision: "13.9.4" - valuesFile: "mongodb.yaml" frigate: repoURL: "https://blakeblackshear.github.io/blakeshome-charts/" chart: "frigate" @@ -246,15 +217,6 @@ infrastructureCharts: valuesFile: prometheus.yaml secrets: - mongodb: - namespace: chart-mongodb - secrets: - auth: - name: "mongo.password" - autogenerated: - - mongodb-root-password - - mongodb-metrics-password - - mongodb-replica-set-key database: namespace: chart-database secrets: @@ -306,14 +268,4 @@ storage: limits: storage: 100Gi requests: - storage: 10Gi - kerberos: - name: kerberos - namespace: apps-kerberos - accessModes: - - ReadWriteMany - resources: - limits: - storage: 100Gi - requests: - storage: 10Gi + storage: 10Gi \ No newline at end of file