Skip to content

Commit 568e041

Browse files
committed
--wip-- [skipci]
1 parent 8b45fe6 commit 568e041

File tree

8 files changed

+25
-18
lines changed

8 files changed

+25
-18
lines changed

kubernetes/main/apps/database/cloudnative-pg/cluster/cluster16.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
key: AWS_SECRET_ACCESS_KEY
5353
bootstrap:
5454
recovery:
55-
source: &previousCluster postgres16-v6
55+
source: &previousCluster main-postgres16-v1
5656
externalClusters:
5757
- name: *previousCluster
5858
barmanObjectStore:

kubernetes/main/apps/database/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
resources:
66
- ./namespace.yaml
7-
- ./cloudnative-pg/ks.yaml
7+
# - ./cloudnative-pg/ks.yaml
88
- ./dragonfly/ks.yaml
99
- ./pgadmin/ks.yaml

kubernetes/main/apps/default/filebrowser/app/helmrelease.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
capabilities: { drop: ["ALL"] }
5858
resources:
5959
requests:
60-
cpu: 100m
60+
cpu: 50m
6161
limits:
6262
memory: 2Gi
6363
defaultPodOptions:

kubernetes/main/apps/default/livebook/app/helmrelease.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ spec:
7171
requests:
7272
cpu: 10m
7373
limits:
74-
cpu: 1000m
74+
cpu: 500m
7575
memory: 1Gi
7676
defaultPodOptions:
7777
securityContext:

kubernetes/main/apps/rook-ceph/rook-ceph/app/helmrelease.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ spec:
3737
enabled: true
3838
resources:
3939
requests:
40+
cpu: 50m # unchangable
4041
memory: 128Mi # unchangable
41-
cpu: 100m # unchangable
4242
limits: {}

kubernetes/main/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
useAllDevices: false
7474
deviceFilter: sda
7575
config:
76-
osdsPerDevice: "2"
76+
osdsPerDevice: "1"
7777
placement:
7878
mgr: &placement
7979
nodeAffinity:
@@ -86,7 +86,7 @@ spec:
8686
resources:
8787
mgr:
8888
requests:
89-
cpu: 100m
89+
cpu: 50m
9090
memory: 512Mi
9191
limits:
9292
memory: 2Gi
@@ -98,13 +98,13 @@ spec:
9898
memory: 1Gi
9999
osd:
100100
requests:
101-
cpu: 500m
102-
memory: 2Gi
101+
cpu: 150m
102+
memory: 1Gi
103103
limits:
104-
memory: 6Gi
104+
memory: 4Gi
105105
mgr-sidecar:
106106
requests:
107-
cpu: 50m
107+
cpu: 20m
108108
memory: 128Mi
109109
limits:
110110
memory: 256Mi
@@ -162,10 +162,10 @@ spec:
162162
app.kubernetes.io/part-of: *cephFileSystemName
163163
resources:
164164
requests:
165-
cpu: 100m
165+
cpu: 50m
166166
memory: 1Gi
167167
limits:
168-
memory: 4Gi
168+
memory: 2Gi
169169
storageClass:
170170
enabled: true
171171
isDefault: false
@@ -205,7 +205,7 @@ spec:
205205
port: 80
206206
resources:
207207
requests:
208-
cpu: 100m
208+
cpu: 80m
209209
memory: 1Gi
210210
limits:
211211
memory: 2Gi
@@ -220,7 +220,7 @@ spec:
220220
reclaimPolicy: Delete
221221
volumeBindingMode: Immediate
222222
parameters:
223-
region: us-east-1
223+
region: us-west-1
224224
ingress:
225225
enabled: true
226226
ingressClassName: internal

kubernetes/main/flux/config/flux.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
- name: manager
6565
resources:
6666
limits:
67-
cpu: 2000m
67+
cpu: 1000m
6868
memory: 2Gi
6969
target:
7070
kind: Deployment

scripts/wipe-disk.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,17 @@
55

66
# Run this in the rook ceph tools pod container on each node:
77

8-
DISK="/dev/sda"; \
8+
# One liner for the rook ceph tools pod container:
9+
# You may also need to remove LVM and device mapper data:
10+
FDISK_BEFORE=$(fdisk -l); \
11+
DISK="/dev/sda"; \
912
sgdisk --zap-all $DISK; \
1013
dd if=/dev/zero of="$DISK" bs=1M count=100 oflag=direct,dsync; \
1114
blkdiscard $DISK; \
12-
partprobe $DISK
15+
partprobe $DISK; \
16+
ls /dev/mapper/ceph-* | xargs -I% -- dmsetup remove %; \
17+
rm -rf /dev/ceph-*; \
18+
rm -rf /dev/mapper/ceph--*; \
19+
diff <(echo "$FDISK_BEFORE") <(fdisk -l)
1320

1421
# Then, delete the operator pod to re-run the osd-prepare job pods

0 commit comments

Comments
 (0)