From 9f1edce7aa9cc6621df572fafccdd1609cd5913d Mon Sep 17 00:00:00 2001 From: Jonathan Leech-Pepin Date: Tue, 1 Apr 2025 21:28:45 -0400 Subject: [PATCH] Switch to deployment and pin to blackstaff StatefulSet doesn't play as nicely with hostPath so use deployment since it supports it without issue. --- namespaces/core/minio/kustomization.yaml | 37 ++++++++----------- .../{statefulset.yaml => deployment.yaml} | 12 +++++- namespaces/core/minio/patches/pvc.yaml | 5 +++ 3 files changed, 32 insertions(+), 22 deletions(-) rename namespaces/core/minio/patches/{statefulset.yaml => deployment.yaml} (75%) create mode 100644 namespaces/core/minio/patches/pvc.yaml diff --git a/namespaces/core/minio/kustomization.yaml b/namespaces/core/minio/kustomization.yaml index a21583f..94c12f4 100644 --- a/namespaces/core/minio/kustomization.yaml +++ b/namespaces/core/minio/kustomization.yaml @@ -12,7 +12,7 @@ transformers: namePrefix: minio- resources: - - ../../../kustomize/statefulset/ + - ../../../kustomize/deployment/ - extras/server-svc.yaml - extras/server-route.yaml @@ -24,15 +24,19 @@ labels: app.kubernetes.io/appNamespace: core patches: - - path: patches/statefulset.yaml + - path: patches/deployment.yaml target: - kind: StatefulSet - name: ss + kind: Deployment + name: app + - path: patches/pvc.yaml + target: + kind: PersistentVolumeClaim + name: pvc replacements: - source: - kind: StatefulSet - name: ss + kind: Deployment + name: app fieldPath: metadata.labels.[app.kubernetes.io/appNamespace] targets: - select: @@ -47,19 +51,10 @@ replacements: fieldPaths: - spec.authentication.universalAuth.secretsScope.secretsPath - source: - kind: StatefulSet - name: ss + kind: Deployment + name: app fieldPath: metadata.labels.[app.kubernetes.io/appName] targets: - - select: - kind: StatefulSet - options: - delimiter: "-" - index: 0 - fieldPaths: - - spec.volumeClaimTemplates.0.metadata.annotations.name - - spec.volumeClaimTemplates.0.metadata.name - - spec.serviceName - select: kind: InfisicalSecret options: @@ -93,8 +88,8 @@ replacements: fieldPaths: - spec.hostnames.0 - source: - kind: StatefulSet - name: ss + kind: Deployment + name: app fieldPath: spec.template.spec.containers.0.ports.0.name targets: - select: @@ -118,8 +113,8 @@ replacements: fieldPaths: - spec.rules.0.backendRefs.0.name - source: - kind: StatefulSet - name: ss + kind: Deployment + name: app fieldPath: spec.template.spec.containers.0.ports.0.containerPort targets: - select: diff --git a/namespaces/core/minio/patches/statefulset.yaml b/namespaces/core/minio/patches/deployment.yaml similarity index 75% rename from namespaces/core/minio/patches/statefulset.yaml rename to namespaces/core/minio/patches/deployment.yaml index 7aa4fac..cb9a120 100644 --- a/namespaces/core/minio/patches/statefulset.yaml +++ b/namespaces/core/minio/patches/deployment.yaml @@ -1,10 +1,20 @@ apiVersion: apps/v1 -kind: StatefulSet +kind: Deployment metadata: name: app spec: template: spec: + affinity: + nodeAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 100 + preference: + matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - blackstaff restartPolicy: Always containers: - name: minio diff --git a/namespaces/core/minio/patches/pvc.yaml b/namespaces/core/minio/patches/pvc.yaml new file mode 100644 index 0000000..54ecf59 --- /dev/null +++ b/namespaces/core/minio/patches/pvc.yaml @@ -0,0 +1,5 @@ +$patch: delete +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: pvc