Skip to content
This repository was archived by the owner on Aug 7, 2025. It is now read-only.

Commit 0d1d72e

Browse files
author
Ganesh Maharaj Mahalingam
authored
Update rook, kata, metrics-server and kube-prometheus (#340)
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
1 parent dc39af1 commit 0d1d72e

8 files changed

Lines changed: 148 additions & 18 deletions

File tree

‎clr-k8s-examples/1-core-metrics/overlays/v0.6.1/kustomization.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
resources:
2+
- components.yaml
3+
patchesJson6902:
4+
- target:
5+
version: v1
6+
kind: Deployment
7+
name: metrics-server
8+
path: patch_metricstls.yaml

‎clr-k8s-examples/1-core-metrics/overlays/v0.6.1/patch_metricstls.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: add
2+
path: "/spec/template/spec/containers/0/args/-"
3+
value: --kubelet-insecure-tls

‎clr-k8s-examples/4-kube-prometheus/overlays/v0.10.0/kustomization.yaml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
resources:
2+
- kube-prometheus/manifests/kubeStateMetrics-serviceAccount.yaml
3+
- kube-prometheus/manifests/blackboxExporter-clusterRole.yaml
4+
- kube-prometheus/manifests/nodeExporter-serviceAccount.yaml
5+
- kube-prometheus/manifests/prometheus-prometheusRule.yaml
6+
- kube-prometheus/manifests/kubernetesControlPlane-serviceMonitorKubeScheduler.yaml
7+
- kube-prometheus/manifests/prometheus-serviceMonitor.yaml
8+
- kube-prometheus/manifests/grafana-dashboardSources.yaml
9+
- kube-prometheus/manifests/kubeStateMetrics-prometheusRule.yaml
10+
- kube-prometheus/manifests/kubePrometheus-prometheusRule.yaml
11+
- kube-prometheus/manifests/prometheus-clusterRole.yaml
12+
- kube-prometheus/manifests/blackboxExporter-serviceMonitor.yaml
13+
- kube-prometheus/manifests/prometheus-roleSpecificNamespaces.yaml
14+
- kube-prometheus/manifests/alertmanager-service.yaml
15+
- kube-prometheus/manifests/prometheusAdapter-serviceMonitor.yaml
16+
- kube-prometheus/manifests/nodeExporter-prometheusRule.yaml
17+
- kube-prometheus/manifests/nodeExporter-service.yaml
18+
- kube-prometheus/manifests/prometheus-roleConfig.yaml
19+
- kube-prometheus/manifests/kubeStateMetrics-clusterRole.yaml
20+
- kube-prometheus/manifests/prometheusOperator-deployment.yaml
21+
- kube-prometheus/manifests/prometheusOperator-serviceMonitor.yaml
22+
- kube-prometheus/manifests/prometheusAdapter-deployment.yaml
23+
- kube-prometheus/manifests/kubernetesControlPlane-serviceMonitorApiserver.yaml
24+
- kube-prometheus/manifests/prometheusAdapter-configMap.yaml
25+
- kube-prometheus/manifests/kubernetesControlPlane-prometheusRule.yaml
26+
- kube-prometheus/manifests/kubeStateMetrics-deployment.yaml
27+
- kube-prometheus/manifests/blackboxExporter-configuration.yaml
28+
- kube-prometheus/manifests/kubeStateMetrics-clusterRoleBinding.yaml
29+
- kube-prometheus/manifests/blackboxExporter-serviceAccount.yaml
30+
- kube-prometheus/manifests/grafana-dashboardDefinitions.yaml
31+
- kube-prometheus/manifests/prometheusOperator-service.yaml
32+
- kube-prometheus/manifests/grafana-service.yaml
33+
- kube-prometheus/manifests/prometheus-prometheus.yaml
34+
- kube-prometheus/manifests/kubernetesControlPlane-serviceMonitorKubeControllerManager.yaml
35+
- kube-prometheus/manifests/alertmanager-alertmanager.yaml
36+
- kube-prometheus/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
37+
- kube-prometheus/manifests/grafana-dashboardDatasources.yaml
38+
- kube-prometheus/manifests/kubernetesControlPlane-serviceMonitorCoreDNS.yaml
39+
- kube-prometheus/manifests/alertmanager-serviceMonitor.yaml
40+
- kube-prometheus/manifests/grafana-deployment.yaml
41+
- kube-prometheus/manifests/grafana-serviceAccount.yaml
42+
- kube-prometheus/manifests/alertmanager-serviceAccount.yaml
43+
- kube-prometheus/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
44+
- kube-prometheus/manifests/prometheusOperator-prometheusRule.yaml
45+
- kube-prometheus/manifests/alertmanager-podDisruptionBudget.yaml
46+
- kube-prometheus/manifests/prometheus-serviceAccount.yaml
47+
- kube-prometheus/manifests/prometheus-service.yaml
48+
- kube-prometheus/manifests/prometheusAdapter-clusterRoleServerResources.yaml
49+
- kube-prometheus/manifests/prometheusAdapter-clusterRoleBinding.yaml
50+
- kube-prometheus/manifests/prometheus-roleBindingConfig.yaml
51+
- kube-prometheus/manifests/nodeExporter-daemonset.yaml
52+
- kube-prometheus/manifests/prometheus-roleBindingSpecificNamespaces.yaml
53+
- kube-prometheus/manifests/nodeExporter-clusterRoleBinding.yaml
54+
- kube-prometheus/manifests/prometheusOperator-serviceAccount.yaml
55+
- kube-prometheus/manifests/prometheusOperator-clusterRoleBinding.yaml
56+
- kube-prometheus/manifests/kubeStateMetrics-serviceMonitor.yaml
57+
- kube-prometheus/manifests/prometheusAdapter-roleBindingAuthReader.yaml
58+
- kube-prometheus/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
59+
- kube-prometheus/manifests/prometheusAdapter-serviceAccount.yaml
60+
- kube-prometheus/manifests/blackboxExporter-deployment.yaml
61+
- kube-prometheus/manifests/alertmanager-prometheusRule.yaml
62+
- kube-prometheus/manifests/prometheus-clusterRoleBinding.yaml
63+
- kube-prometheus/manifests/prometheusAdapter-clusterRole.yaml
64+
- kube-prometheus/manifests/grafana-serviceMonitor.yaml
65+
- kube-prometheus/manifests/nodeExporter-clusterRole.yaml
66+
- kube-prometheus/manifests/prometheusAdapter-service.yaml
67+
- kube-prometheus/manifests/prometheus-podDisruptionBudget.yaml
68+
- kube-prometheus/manifests/blackboxExporter-service.yaml
69+
- kube-prometheus/manifests/nodeExporter-serviceMonitor.yaml
70+
- kube-prometheus/manifests/blackboxExporter-clusterRoleBinding.yaml
71+
- kube-prometheus/manifests/alertmanager-secret.yaml
72+
- kube-prometheus/manifests/prometheusAdapter-apiService.yaml
73+
- kube-prometheus/manifests/prometheusOperator-clusterRole.yaml
74+
- kube-prometheus/manifests/grafana-config.yaml
75+
- kube-prometheus/manifests/prometheusAdapter-podDisruptionBudget.yaml
76+
- kube-prometheus/manifests/kubeStateMetrics-service.yaml

‎clr-k8s-examples/7-rook/overlays/v1.8.6/multinode/kustomization.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resources:
2+
- rook/deploy/examples/cluster.yaml
3+
- rook/deploy/examples/csi/rbd/storageclass.yaml

‎clr-k8s-examples/7-rook/overlays/v1.8.6/standalone/kustomization.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
resources:
2+
- rook/deploy/examples/cluster.yaml
3+
- rook/deploy/examples/csi/rbd/storageclass.yaml
4+
5+
patchesStrategicMerge:
6+
# patches rook to use 'directories' instead of partitions.
7+
# comment out to use partitions
8+
- patch_cephcluster.yaml

‎clr-k8s-examples/7-rook/overlays/v1.8.6/standalone/patch_cephcluster.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
apiVersion: ceph.rook.io/v1
3+
kind: CephCluster
4+
metadata:
5+
name: rook-ceph
6+
namespace: rook-ceph
7+
spec:
8+
mon:
9+
allowMultiplePerNode: true
10+
---
11+
apiVersion: ceph.rook.io/v1
12+
kind: CephBlockPool
13+
metadata:
14+
name: replicapool
15+
namespace: rook-ceph
16+
spec:
17+
replicated:
18+
requireSafeReplicaSize: false
19+
size: 1

‎clr-k8s-examples/8-kata/overlays/2.3.3/.gitkeep‎

Whitespace-only changes.

‎clr-k8s-examples/create_stack.sh‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ CILIUM_VER="${CLRK8S_CILIUM_VER:-v1.9.13}"
2323
FLANNEL_VER="${CLRK8S_FLANNEL_VER:-v0.16.3}"
2424
CILIUM_VAL_OVERRIDE=""
2525
K8S_VER="${CLRK8S_K8S_VER:-}"
26-
KATA_VER="${CLRK8S_KATA_VER:-1.9.1-kernel-config}"
27-
ROOK_VER="${CLRK8S_ROOK_VER:-v1.2.6}"
28-
METRICS_VER="${CLRK8S_METRICS_VER:-v0.3.6}"
26+
KATA_VER="${CLRK8S_KATA_VER:-2.3.3}"
27+
ROOK_VER="${CLRK8S_ROOK_VER:-v1.8.6}"
28+
METRICS_VER="${CLRK8S_METRICS_VER:-v0.6.1}"
2929
DASHBOARD_VER="${CLRK8S_DASHBOARD_VER:-v2.0.0-beta2}"
3030
INGRES_VER="${CLRK8S_INGRES_VER:-nginx-0.26.1}"
3131
EFK_VER="${CLRK8S_EFK_VER:-v1.15.1}"
3232
METALLB_VER="${CLRK8S_METALLB_VER:-v0.8.3}"
3333
NPD_VER="${CLRK8S_NPD_VER:-v0.6.6}"
34-
PROMETHEUS_VER="${CLRK8S_PROMETHEUS_VER:-f458e85e5d7675f7bc253072e1b4c8892b51af0f}"
34+
PROMETHEUS_VER="${CLRK8S_PROMETHEUS_VER:-v0.10.0}"
3535
CNI=${CLRK8S_CNI:-"canal"}
3636
if [[ -z "${RUNNER+x}" ]]; then RUNNER="${CLRK8S_RUNNER:-"crio"}"; fi
3737

@@ -124,11 +124,13 @@ function cluster_init() {
124124

125125
function kata() {
126126
KATA_VER=${1:-$KATA_VER}
127-
KATA_URL="https://github.com/kata-containers/packaging.git"
127+
KATA_URL="https://github.com/kata-containers/kata-containers.git"
128128
KATA_DIR="8-kata"
129129
get_repo "${KATA_URL}" "${KATA_DIR}/overlays/${KATA_VER}"
130-
set_repo_version "${KATA_VER}" "${KATA_DIR}/overlays/${KATA_VER}/packaging"
131-
kubectl apply -k "${KATA_DIR}/overlays/${KATA_VER}"
130+
set_repo_version "${KATA_VER}" "${KATA_DIR}/overlays/${KATA_VER}/kata-containers"
131+
kubectl apply -f "${KATA_DIR}/overlays/${KATA_VER}/kata-containers/tools/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml"
132+
kubectl apply -f "${KATA_DIR}/overlays/${KATA_VER}/kata-containers/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml"
133+
kubectl apply -f "${KATA_DIR}/overlays/${KATA_VER}/kata-containers/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml"
132134

133135
}
134136

@@ -183,21 +185,19 @@ function cni() {
183185

184186
function metrics() {
185187
METRICS_VER="${1:-$METRICS_VER}"
186-
METRICS_URL="https://github.com/kubernetes-sigs/metrics-server.git"
188+
METRICS_URL="https://github.com/kubernetes-sigs/metrics-server/releases/download/${METRICS_VER}/components.yaml"
187189
METRICS_DIR="1-core-metrics"
188-
get_repo "${METRICS_URL}" "${METRICS_DIR}/overlays/${METRICS_VER}"
189-
set_repo_version "${METRICS_VER}" "${METRICS_DIR}/overlays/${METRICS_VER}/metrics-server"
190-
kubectl apply -k "${METRICS_DIR}/overlays/${METRICS_VER}"
190+
191+
curl -L ${METRICS_URL} --output - >${METRICS_DIR}/overlays/${METRICS_VER}/components.yaml
192+
kubectl apply -k "${METRICS_DIR}/overlays/${METRICS_VER}/"
191193

192194
}
193195
function wait_on_pvc() {
194196
# create and destroy pvc until successful
195197
while [[ $(kubectl get pvc test-pv-claim --no-headers | grep Bound -c) -ne 1 ]]; do
196198
sleep 30
197-
kubectl delete pvc test-pv-claim
198-
create_pvc
199-
sleep 10
200199
done
200+
kubectl delete pvc test-pv-claim
201201
}
202202
function create_pvc() {
203203
kubectl apply -f - <<HERE
@@ -222,9 +222,19 @@ function storage() {
222222
ROOK_URL="https://github.com/rook/rook.git"
223223
ROOK_DIR=7-rook
224224

225+
# This function might be called standalone, so good to check the mode we are in.
226+
if [ "$(kubectl get nodes --no-headers | wc -l)" -eq 1 ]; then
227+
mode="standalone"
228+
fi
229+
225230
# get and apply rook
226231
get_repo "${ROOK_URL}" "${ROOK_DIR}/overlays/${ROOK_VER}/${mode}"
227232
set_repo_version "${ROOK_VER}" "${ROOK_DIR}/overlays/${ROOK_VER}/${mode}/rook"
233+
kubectl apply -f ${ROOK_DIR}/overlays/${ROOK_VER}/${mode}/rook/deploy/examples/crds.yaml -f ${ROOK_DIR}/overlays/${ROOK_VER}/${mode}/rook/deploy/examples/common.yaml -f ${ROOK_DIR}/overlays/${ROOK_VER}/${mode}/rook/deploy/examples/operator.yaml
234+
while [[ $(kubectl get po -n rook-ceph --field-selector=status.phase=Running | grep -e 'operator' -c) -lt 1 ]]; do
235+
echo "Waiting on operator"
236+
sleep 10
237+
done
228238
kubectl apply -k "${ROOK_DIR}/overlays/${ROOK_VER}/${mode}"
229239
# wait for the rook OSDs to run which means rooks should be ready
230240
while [[ $(kubectl get po --all-namespaces | grep -e 'osd.*Running.*' -c) -lt 1 ]]; do
@@ -246,12 +256,13 @@ function monitoring() {
246256
PROMETHEUS_DIR="4-kube-prometheus"
247257
get_repo "${PROMETHEUS_URL}" "${PROMETHEUS_DIR}/overlays/${PROMETHEUS_VER}"
248258
set_repo_version "${PROMETHEUS_VER}" "${PROMETHEUS_DIR}/overlays/${PROMETHEUS_VER}/kube-prometheus"
249-
kubectl apply -k "${PROMETHEUS_DIR}/overlays/${PROMETHEUS_VER}"
259+
kubectl apply --server-side -f "${PROMETHEUS_DIR}/overlays/${PROMETHEUS_VER}/kube-prometheus/manifests/setup/"
250260

251-
while [[ $(kubectl get crd alertmanagers.monitoring.coreos.com prometheuses.monitoring.coreos.com prometheusrules.monitoring.coreos.com servicemonitors.monitoring.coreos.com >/dev/null 2>&1) || $? -ne 0 ]]; do
252-
echo "Waiting for Prometheus CRDs"
253-
sleep 2
261+
while ! $(kubectl get servicemonitors --all-namespaces) ; do
262+
echo "Waiting for prometheus crds"
263+
sleep 10
254264
done
265+
kubectl apply -k "${PROMETHEUS_DIR}/overlays/${PROMETHEUS_VER}/"
255266

256267
#Expose the dashboards
257268
#kubectl --namespace monitoring port-forward svc/prometheus-k8s 9090 &
@@ -382,6 +393,8 @@ command_handlers[monitoring]=monitoring
382393
command_handlers[metallb]=metallb
383394
command_handlers[npd]=npd
384395
command_handlers[nfd]=nfd
396+
command_handlers[kata]=kata
397+
command_handlers[metrics]=metrics
385398

386399
declare -A command_help
387400
command_help[init]="Only inits a cluster using kubeadm"

0 commit comments

Comments
 (0)