From 752a56fa4eda1ee893bbcfcf221fc079f92f6860 Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Thu, 8 May 2025 11:59:27 +0200 Subject: [PATCH] delete ubuntu 3 and echo server --- echo-server/app/helmrelease.yaml | 103 ------------------------------ echo-server/ks.yaml | 20 ------ kustomization.yaml | 2 - repos/helm/bjw-s.yaml | 11 ---- ubuntu-vm-3/ks.yaml | 18 ------ ubuntu-vm-3/ubuntu/ubuntu-vm.yaml | 48 -------------- 6 files changed, 202 deletions(-) delete mode 100644 echo-server/app/helmrelease.yaml delete mode 100644 echo-server/ks.yaml delete mode 100644 repos/helm/bjw-s.yaml delete mode 100644 ubuntu-vm-3/ks.yaml delete mode 100644 ubuntu-vm-3/ubuntu/ubuntu-vm.yaml diff --git a/echo-server/app/helmrelease.yaml b/echo-server/app/helmrelease.yaml deleted file mode 100644 index 7250687..0000000 --- a/echo-server/app/helmrelease.yaml +++ /dev/null @@ -1,103 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: &app echo-server -spec: - serviceAccountName: ${TECHNICAL_ACCOUNT} - interval: 30m - chart: - spec: - chart: app-template - version: 3.2.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: ${TENANT_NAMESPACE} - install: - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - strategy: rollback - retries: 3 - values: - controllers: - echo-server: - replicas: 2 - strategy: RollingUpdate - containers: - app: - image: - repository: ghcr.io/mendhak/http-https-echo - tag: 33 - env: - HTTP_PORT: &port 8080 - LOG_WITHOUT_NEWLINE: true - LOG_IGNORE_PATH: /healthz - PROMETHEUS_ENABLED: true - probes: - liveness: &probes - enabled: true - custom: true - spec: - httpGet: - path: /healthz - port: *port - initialDelaySeconds: 0 - periodSeconds: 10 - timeoutSeconds: 1 - failureThreshold: 3 - readiness: *probes - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - capabilities: { drop: ["ALL"] } - seccompProfile: - type: RuntimeDefault - resources: - requests: - cpu: 10m - memory: 64Mi - limits: - memory: 64Mi - cpu: 100m - defaultPodOptions: - securityContext: - runAsNonRoot: true - seccompProfile: { type: RuntimeDefault } - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: kubernetes.io/hostname - whenUnsatisfiable: DoNotSchedule - labelSelector: - matchLabels: - app.kubernetes.io/name: *app - service: - app: - controller: echo-server - ports: - http: - port: *port - serviceMonitor: - app: - serviceName: echo-server - endpoints: - - port: http - scheme: http - path: /metrics - interval: 1m - scrapeTimeout: 10s - ingress: - app: - className: external - hosts: - - host: "{{ .Release.Name }}-${TENANT_DOMAIN}" - paths: - - path: / - service: - identifier: app - port: http - diff --git a/echo-server/ks.yaml b/echo-server/ks.yaml deleted file mode 100644 index 4448636..0000000 --- a/echo-server/ks.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app echo-server - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./echo-server/app - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m diff --git a/kustomization.yaml b/kustomization.yaml index 80d2821..194155a 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -3,10 +3,8 @@ kind: Kustomization resources: - vars/ks.yaml - repos/ks.yaml - - echo-server/ks.yaml - ubuntu-vm-1/ks.yaml - ubuntu-vm-2/ks.yaml - - ubuntu-vm-3/ks.yaml - container/ks-debug.yaml - templates/image-server/ks-nginx.yaml - templates/image-server/ks-pvc.yaml diff --git a/repos/helm/bjw-s.yaml b/repos/helm/bjw-s.yaml deleted file mode 100644 index 90cdc7f..0000000 --- a/repos/helm/bjw-s.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: bjw-s - namespace: ${TENANT_NAMESPACE} -spec: - interval: 5m - url: https://bjw-s-labs.github.io/helm-charts - diff --git a/ubuntu-vm-3/ks.yaml b/ubuntu-vm-3/ks.yaml deleted file mode 100644 index 12912dc..0000000 --- a/ubuntu-vm-3/ks.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app ubuntu-vm-3 - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./ubuntu-vm-3/ubuntu - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m diff --git a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml deleted file mode 100644 index 3164a85..0000000 --- a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: kubevirt.io/v1 -kind: VirtualMachine -metadata: - name: ubuntu-vm-3 - namespace: demo -spec: - running: true - template: - metadata: - labels: - kubevirt.io/domain: ubuntu-vm-3 - spec: - domain: - cpu: - cores: 1 - devices: - disks: - - disk: - bus: virtio - name: containerdisk - - disk: - bus: virtio - name: cloudinitdisk - resources: - requests: - memory: 2Gi - cpu: 1 - limits: - memory: 2Gi - cpu: 1 - memory: - guest: 2Gi - volumes: - - name: containerdisk - containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 - - name: cloudinitdisk - cloudInitNoCloud: - userData: | - #cloud-config - hostname: ubuntu-vm-3 - ssh_pwauth: True - users: - - name: ubuntu - ssh-authorized-keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqlhZW/pPLK8zENt3o6tgl0QVinhGAF1sHvajqq3UvI ubuntu - sudo: ['ALL=(ALL) NOPASSWD:ALL'] - shell: /bin/bash \ No newline at end of file