Skip to content

Commit

Permalink
Update dependency docker.io/bitnami/kubectl to v1.26.2
Browse files Browse the repository at this point in the history 
Signed-off-by: Renovate Bot <tech+renovate@vshn.ch>
  • Loading branch information
@vshn-renovate
vshn-renovate committed Mar 13, 2023
1 parent c10bf68 commit 865a4e6
Show file tree
Hide file tree
Showing 11 changed files with 895 additions and 845 deletions.
2 changes: 1 addition & 1 deletion class/defaults.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ parameters:
kubectl:
registry: docker.io
image: bitnami/kubectl
tag: '1.25.5@sha256:19dff0248157ae4cd320097ace1b5e0ffbb8bc7c7ea7fa3f13f73993fc6d7ee2'
tag: '1.26.2@sha256:bd009684b97e55de78278a274727c821d2295819adf5f547228bd4d6d7c4f7eb'

charts:
# We do not support helm chart versions older than v1.7.0
Expand Down
239 changes: 193 additions & 46 deletions ...en/defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/configmap.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,80 @@
apiVersion: v1
data:
CSI_CEPHFS_FSGROUPPOLICY: File
CSI_CEPHFS_PLUGIN_RESOURCE: "- name : driver-registrar\n resource:\n requests:\n\
\ memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n \
\ cpu: 100m\n- name : csi-cephfsplugin\n resource:\n requests:\n memory:\
\ 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n cpu: 500m\n- name\
\ : liveness-prometheus\n resource:\n requests:\n memory: 128Mi\n \
\ cpu: 50m\n limits:\n memory: 256Mi\n cpu: 100m\n"
CSI_CEPHFS_PROVISIONER_RESOURCE: "- name : csi-provisioner\n resource:\n requests:\n\
\ memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n \
\ cpu: 200m\n- name : csi-resizer\n resource:\n requests:\n memory:\
\ 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n cpu: 200m\n\
- name : csi-attacher\n resource:\n requests:\n memory: 128Mi\n \
\ cpu: 100m\n limits:\n memory: 256Mi\n cpu: 200m\n- name : csi-snapshotter\n\
\ resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n\
\ memory: 256Mi\n cpu: 200m\n- name : csi-cephfsplugin\n resource:\n\
\ requests:\n memory: 512Mi\n cpu: 250m\n limits:\n memory:\
\ 1Gi\n cpu: 500m\n- name : liveness-prometheus\n resource:\n requests:\n\
\ memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n \
\ cpu: 100m\n"
CSI_CEPHFS_PLUGIN_RESOURCE: |
- name : driver-registrar
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
- name : csi-cephfsplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
CSI_CEPHFS_PROVISIONER_RESOURCE: |
- name : csi-provisioner
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-resizer
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-attacher
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-snapshotter
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-cephfsplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
CSI_ENABLE_CEPHFS_SNAPSHOTTER: 'true'
CSI_ENABLE_CSIADDONS: 'false'
CSI_ENABLE_ENCRYPTION: 'false'
Expand All @@ -32,39 +88,130 @@ data:
CSI_FORCE_CEPHFS_KERNEL_CLIENT: 'true'
CSI_GRPC_TIMEOUT_SECONDS: '150'
CSI_NFS_FSGROUPPOLICY: File
CSI_NFS_PLUGIN_RESOURCE: "- name : driver-registrar\n resource:\n requests:\n\
\ memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n \
\ cpu: 100m\n- name : csi-nfsplugin\n resource:\n requests:\n memory:\
\ 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n cpu: 500m\n"
CSI_NFS_PROVISIONER_RESOURCE: "- name : csi-provisioner\n resource:\n requests:\n\
\ memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n \
\ cpu: 200m\n- name : csi-nfsplugin\n resource:\n requests:\n memory:\
\ 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n cpu: 500m\n"
CSI_NFS_PLUGIN_RESOURCE: |
- name : driver-registrar
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
- name : csi-nfsplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
CSI_NFS_PROVISIONER_RESOURCE: |
- name : csi-provisioner
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-nfsplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
CSI_PLUGIN_ENABLE_SELINUX_HOST_MOUNT: 'false'
CSI_PLUGIN_PRIORITY_CLASSNAME: system-node-critical
CSI_PROVISIONER_PRIORITY_CLASSNAME: system-cluster-critical
CSI_PROVISIONER_REPLICAS: '2'
CSI_PROVISIONER_TOLERATIONS: "- key: storagenode\n operator: Exists"
CSI_PROVISIONER_TOLERATIONS: |-
- key: storagenode
operator: Exists
CSI_RBD_FSGROUPPOLICY: File
CSI_RBD_PLUGIN_RESOURCE: "- name : driver-registrar\n resource:\n requests:\n\
\ memory: 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n \
\ cpu: 100m\n- name : csi-rbdplugin\n resource:\n requests:\n memory:\
\ 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n cpu: 500m\n- name\
\ : liveness-prometheus\n resource:\n requests:\n memory: 128Mi\n \
\ cpu: 50m\n limits:\n memory: 256Mi\n cpu: 100m\n"
CSI_RBD_PROVISIONER_RESOURCE: "- name : csi-provisioner\n resource:\n requests:\n\
\ memory: 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n \
\ cpu: 200m\n- name : csi-resizer\n resource:\n requests:\n memory:\
\ 128Mi\n cpu: 100m\n limits:\n memory: 256Mi\n cpu: 200m\n\
- name : csi-attacher\n resource:\n requests:\n memory: 128Mi\n \
\ cpu: 100m\n limits:\n memory: 256Mi\n cpu: 200m\n- name : csi-snapshotter\n\
\ resource:\n requests:\n memory: 128Mi\n cpu: 100m\n limits:\n\
\ memory: 256Mi\n cpu: 200m\n- name : csi-rbdplugin\n resource:\n \
\ requests:\n memory: 512Mi\n cpu: 250m\n limits:\n memory:\
\ 1Gi\n cpu: 500m\n- name : csi-omap-generator\n resource:\n requests:\n\
\ memory: 512Mi\n cpu: 250m\n limits:\n memory: 1Gi\n cpu:\
\ 500m\n- name : liveness-prometheus\n resource:\n requests:\n memory:\
\ 128Mi\n cpu: 50m\n limits:\n memory: 256Mi\n cpu: 100m\n"
CSI_RBD_PLUGIN_RESOURCE: |
- name : driver-registrar
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
- name : csi-rbdplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
CSI_RBD_PROVISIONER_RESOURCE: |
- name : csi-provisioner
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-resizer
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-attacher
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-snapshotter
resource:
requests:
memory: 128Mi
cpu: 100m
limits:
memory: 256Mi
cpu: 200m
- name : csi-rbdplugin
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : csi-omap-generator
resource:
requests:
memory: 512Mi
cpu: 250m
limits:
memory: 1Gi
cpu: 500m
- name : liveness-prometheus
resource:
requests:
memory: 128Mi
cpu: 50m
limits:
memory: 256Mi
cpu: 100m
ROOK_CEPH_ALLOW_LOOP_DEVICES: 'false'
ROOK_CEPH_COMMANDS_TIMEOUT_SECONDS: '15'
ROOK_CSIADDONS_IMAGE: quay.io/csiaddons/k8s-sidecar:v0.5.0
Expand Down
9 changes: 2 additions & 7 deletions tests/golden/defaults/rook-ceph/rook-ceph/10_cephcluster_configoverride.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
apiVersion: v1
data:
config: '[global]
config: |
[global]
mon_data_avail_warn = 15
mon_osd_backfillfull_ratio = 0.8
mon_osd_full_ratio = 0.85
mon_osd_nearfull_ratio = 0.75
'
kind: ConfigMap
metadata:
annotations: {}
Expand Down
88 changes: 63 additions & 25 deletions tests/golden/defaults/rook-ceph/rook-ceph/10_cephcluster_toolbox.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,69 @@ spec:
- command:
- /bin/bash
- -c
- "# Replicate the script from toolbox.sh inline so the ceph image\n#\
\ can be run directly, instead of requiring the rook toolbox\nCEPH_CONFIG=\"\
/etc/ceph/ceph.conf\"\nMON_CONFIG=\"/etc/rook/mon-endpoints\"\nKEYRING_FILE=\"\
/etc/ceph/keyring\"\n\n# create a ceph config file in its default location\
\ so ceph/rados tools can be used\n# without specifying any arguments\n\
write_endpoints() {\n endpoints=$(cat ${MON_CONFIG})\n\n # filter\
\ out the mon names\n # external cluster can have numbers or hyphens\
\ in mon names, handling them in regex\n # shellcheck disable=SC2001\n\
\ mon_endpoints=$(echo \"${endpoints}\"| sed 's/[a-z0-9_-]\\+=//g')\n\
\n DATE=$(date)\n echo \"$DATE writing mon endpoints to ${CEPH_CONFIG}:\
\ ${endpoints}\"\n cat <<EOF > ${CEPH_CONFIG}\n[global]\nmon_host\
\ = ${mon_endpoints}\n\n[client.admin]\nkeyring = ${KEYRING_FILE}\n\
EOF\n}\n\n# watch the endpoints config file and update if the mon endpoints\
\ ever change\nwatch_endpoints() {\n # get the timestamp for the target\
\ of the soft link\n real_path=$(realpath ${MON_CONFIG})\n initial_time=$(stat\
\ -c %Z \"${real_path}\")\n while true; do\n real_path=$(realpath\
\ ${MON_CONFIG})\n latest_time=$(stat -c %Z \"${real_path}\")\n\n\
\ if [[ \"${latest_time}\" != \"${initial_time}\" ]]; then\n \
\ write_endpoints\n initial_time=${latest_time}\n fi\n\n \
\ sleep 10\n done\n}\n\n# read the secret from an env var (for backward\
\ compatibility), or from the secret file\nceph_secret=${ROOK_CEPH_SECRET}\n\
if [[ \"$ceph_secret\" == \"\" ]]; then\n ceph_secret=$(cat /var/lib/rook-ceph-mon/secret.keyring)\n\
fi\n\n# create the keyring file\ncat <<EOF > ${KEYRING_FILE}\n[${ROOK_CEPH_USERNAME}]\n\
key = ${ceph_secret}\nEOF\n\n# write the initial config file\nwrite_endpoints\n\
\n# continuously update the mon endpoints if they fail over\nwatch_endpoints\n"
- |
# Replicate the script from toolbox.sh inline so the ceph image
# can be run directly, instead of requiring the rook toolbox
CEPH_CONFIG="/etc/ceph/ceph.conf"
MON_CONFIG="/etc/rook/mon-endpoints"
KEYRING_FILE="/etc/ceph/keyring"
# create a ceph config file in its default location so ceph/rados tools can be used
# without specifying any arguments
write_endpoints() {
endpoints=$(cat ${MON_CONFIG})
# filter out the mon names
# external cluster can have numbers or hyphens in mon names, handling them in regex
# shellcheck disable=SC2001
mon_endpoints=$(echo "${endpoints}"| sed 's/[a-z0-9_-]\+=//g')
DATE=$(date)
echo "$DATE writing mon endpoints to ${CEPH_CONFIG}: ${endpoints}"
cat <<EOF > ${CEPH_CONFIG}
[global]
mon_host = ${mon_endpoints}
[client.admin]
keyring = ${KEYRING_FILE}
EOF
}
# watch the endpoints config file and update if the mon endpoints ever change
watch_endpoints() {
# get the timestamp for the target of the soft link
real_path=$(realpath ${MON_CONFIG})
initial_time=$(stat -c %Z "${real_path}")
while true; do
real_path=$(realpath ${MON_CONFIG})
latest_time=$(stat -c %Z "${real_path}")
if [[ "${latest_time}" != "${initial_time}" ]]; then
write_endpoints
initial_time=${latest_time}
fi
sleep 10
done
}
# read the secret from an env var (for backward compatibility), or from the secret file
ceph_secret=${ROOK_CEPH_SECRET}
if [[ "$ceph_secret" == "" ]]; then
ceph_secret=$(cat /var/lib/rook-ceph-mon/secret.keyring)
fi
# create the keyring file
cat <<EOF > ${KEYRING_FILE}
[${ROOK_CEPH_USERNAME}]
key = ${ceph_secret}
EOF
# write the initial config file
write_endpoints
# continuously update the mon endpoints if they fail over
watch_endpoints
env:
- name: ROOK_CEPH_USERNAME
valueFrom:
Expand Down
Loading

0 comments on commit 865a4e6

Please sign in to comment.