From 3131bfcb502c449fbc7a5e541762df4f6d5a1115 Mon Sep 17 00:00:00 2001 From: outductor Date: Sat, 16 Dec 2023 15:41:55 +0900 Subject: [PATCH] update csi --- .../descheduler/kustomization.yaml | 4 +-- .../kustomization.yaml | 31 +++++-------------- .../bungeecord/kustomization.yaml | 25 +++++++-------- 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/descheduler/kustomization.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/descheduler/kustomization.yaml index 52c8a8584..c18cb3d30 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/descheduler/kustomization.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/descheduler/kustomization.yaml @@ -5,5 +5,5 @@ resources: # descheduler - github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=v0.28.1 -patchesStrategicMerge: - - ./patch-schedule.yaml +patches: + - path: ./patch-schedule.yaml diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/synology-csi-storageclass/kustomization.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/synology-csi-storageclass/kustomization.yaml index a33c3f0bb..6e3fb20d5 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/synology-csi-storageclass/kustomization.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cluster-wide-apps/synology-csi-storageclass/kustomization.yaml @@ -1,27 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.2/deploy/kubernetes/v1.20/controller.yml - - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.2/deploy/kubernetes/v1.20/csi-driver.yml - - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.2/deploy/kubernetes/v1.20/node.yml - - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.2/deploy/kubernetes/v1.20/storage-class.yml - - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.2/deploy/kubernetes/v1.20/snapshotter/snapshotter.yaml - - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.2/deploy/kubernetes/v1.20/snapshotter/volume-snapshot-class.yml - -images: - - name: synology/synology-csi - newTag: latest - - name: k8s.gcr.io/sig-storage/csi-snapshotter - newName: registry.k8s.io/sig-storage/csi-snapshotter - - name: k8s.gcr.io/sig-storage/csi-provisioner - newName: registry.k8s.io/sig-storage/csi-provisioner - - name: k8s.gcr.io/sig-storage/csi-attacher - newName: registry.k8s.io/sig-storage/csi-attacher - - name: k8s.gcr.io/sig-storage/csi-resizer - newName: registry.k8s.io/sig-storage/csi-resizer - - name: k8s.gcr.io/sig-storage/csi-node-driver-registrar - newName: registry.k8s.io/sig-storage/csi-node-driver-registrar - - name: k8s.gcr.io/sig-storage/csi-snapshotter - newName: registry.k8s.io/sig-storage/csi-snapshotter -patches: - - path: ./storageclass.yaml + - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.3/deploy/kubernetes/v1.20/controller.yml + - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.3/deploy/kubernetes/v1.20/csi-driver.yml + - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.3/deploy/kubernetes/v1.20/node.yml + - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.3/deploy/kubernetes/v1.20/storage-class.yml + - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.3/deploy/kubernetes/v1.20/snapshotter/snapshotter.yaml + - https://raw.githubusercontent.com/SynologyOpenSource/synology-csi/v1.1.3/deploy/kubernetes/v1.20/snapshotter/volume-snapshot-class.yml + - ./storageclass.yaml diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/kustomization.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/kustomization.yaml index 9ea16acec..78bd365d7 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/kustomization.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/kustomization.yaml @@ -2,24 +2,23 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: seichi-gateway resources: - - "../../../app-templates/minecraft-gateway-bungeecord" - - "./bungeecord-config.yaml" + - ../../../app-templates/minecraft-gateway-bungeecord + - ./bungeecord-config.yaml -patchesStrategicMerge: - - "bungeecord-metrics-patch.yaml" - - "bungeecord-plugin-configs-patch.yaml" - - "service-bungeecord-loadbalancer.yaml" -patchesJson6902: - - target: - group: apps - version: v1 - kind: Deployment - name: bungeecord - patch: |- +patches: + - patch: |- - op: replace path: /spec/template/spec/containers/0/resources/requests/memory value: 1024Mi - op: replace path: /spec/template/spec/containers/0/env/0/value value: 1024m + target: + group: apps + kind: Deployment + name: bungeecord + version: v1 + - path: bungeecord-metrics-patch.yaml + - path: bungeecord-plugin-configs-patch.yaml + - path: service-bungeecord-loadbalancer.yaml