Skip to content

Commit ffade96

Browse files
authored
Merge pull request #154 from seokho-son/main
Use cb-tumblebug v0.12.15
2 parents 1b65b52 + 4a81b04 commit ffade96

5 files changed

Lines changed: 132 additions & 14 deletions

File tree

conf/docker/conf/mc-infra-manager/assets/cloudimage.csv

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,13 @@ AWS,all,WINDOWS_CORE_2025_x86_64,Windows Server 2025,"EKS Node - Windows Server
3939
GCP,all,COS_CONTAINERD,Container-Optimized OS,"GKE Node - COS, containerd, x86_64/ARM64",,k8s,x86_64,COS_CONTAINERD
4040
GCP,all,UBUNTU_CONTAINERD,Ubuntu 22.04 LTS,"GKE Node - Ubuntu 22.04, containerd, x86_64/ARM64",,k8s,x86_64,UBUNTU_CONTAINERD
4141
GCP,all,WINDOWS_LTSC_CONTAINERD,Windows Server 2019 LTSC,"GKE Node - Windows Server 2019 LTSC, containerd, x86_64",,k8s,x86_64,WINDOWS_LTSC_CONTAINERD
42+
TENCENT,all,tlinux4_x86_64_public,TencentOS Server 4,"TKE Node - TencentOS Server 4, x86_64",,k8s,x86_64,tlinux4_x86_64_public
43+
TENCENT,all,tlinux3.1x86_64,TencentOS Server 3.1 (TK4),"TKE Node - TencentOS Server 3.1 (TK4), x86_64",,k8s,x86_64,tlinux3.1x86_64
44+
TENCENT,all,tlinux2.4(tkernel4)x86_64_HCC,TencentOS Server 2.4 (TK4) HCC,"TKE Node - TencentOS Server 2.4 (TK4) HCC, x86_64",,k8s,x86_64,tlinux2.4(tkernel4)x86_64_HCC
45+
TENCENT,all,tlinux2.4(tkernel4)x86_64,TencentOS Server 2.4 (TK4),"TKE Node - TencentOS Server 2.4 (TK4), x86_64",,k8s,x86_64,tlinux2.4(tkernel4)x86_64
46+
TENCENT,all,tlinux2.4x86_64,TencentOS Server 2.4,"TKE Node - TencentOS Server 2.4 (legacy), x86_64",,k8s,x86_64,tlinux2.4x86_64
47+
TENCENT,all,centos7.8.0_x64,CentOS 7.8,"TKE Node - CentOS 7.8, x86_64",,k8s,x86_64,centos7.8.0_x64
48+
TENCENT,all,centos8.0x86_64,CentOS 8.0,"TKE Node - CentOS 8.0, x86_64 (Beta)",,k8s,x86_64,centos8.0x86_64
49+
TENCENT,all,ubuntu20.04x86_64,Ubuntu 20.04,"TKE Node - Ubuntu 20.04, x86_64 (Beta)",,k8s,x86_64,ubuntu20.04x86_64
50+
TENCENT,all,ubuntu22.04x86_64,Ubuntu 22.04,"TKE Node - Ubuntu 22.04, x86_64",,k8s,x86_64,ubuntu22.04x86_64
51+
TENCENT,all,redhat7.9x86_64,Red Hat Enterprise Linux 7.9,"TKE Node - Red Hat Enterprise Linux 7.9, x86_64",,k8s,x86_64,redhat7.9x86_64
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Cloud Image Ignore Configuration
2+
# Defines patterns for images that should be skipped during image fetching operations.
3+
# Matched images are dropped during fetch, before any conversion or storage in DB.
4+
# Pattern matching is case-insensitive and supports * and ? wildcards and [abc] character classes.
5+
6+
# Global patterns that apply to all CSPs
7+
global:
8+
patterns: []
9+
10+
# CSP-specific ignore patterns
11+
csps:
12+
aws:
13+
description: "AWS image ignore patterns"
14+
global_patterns:
15+
# ── Managed-service / internal AMIs (not for direct EC2/EKS provisioning) ──
16+
- "*parallelcluster*" # AWS ParallelCluster AMIs — HPC cluster orchestration tool only, not for general VM use
17+
- "*elasticbeanstalk*" # Elastic Beanstalk PaaS AMIs — managed by EB service, not for direct VM use
18+
- "*-ecs-*" # ECS-optimized AMIs — ECS container worker nodes (distinct from EKS), not for general VM use
19+
- "*ecs*optimized*" # Windows ECS Optimized AMIs — underscore format not caught by *-ecs-*
20+
- "*ecs-managed-instances*" # ECS managed node images — ECS internal managed images
21+
- "*lambda-managed-instances*" # Lambda internal worker images — not for user VM creation
22+
- "*lambda-elevator*" # Lambda microVM internal worker images — AWS internal use only
23+
- "*storage*gateway*" # AWS Storage Gateway appliance AMIs — virtual storage appliance, not for general VM use
24+
- "*datasync*" # AWS DataSync appliance AMIs — managed data transfer service, not for general VM use
25+
- "*cloud9*" # AWS Cloud9 IDE AMIs — cloud IDE environment, not for general VM use
26+
- "*dcv-*" # NICE DCV AMIs — remote visualization streaming tool, not for general VM use
27+
# ── EKS managed node group AMIs ──────────────────────────────────────────
28+
# EKS managed node groups select images via AMI type (NodegroupAmiType,
29+
# e.g. AL2023_x86_64_STANDARD, BOTTLEROCKET_x86_64), not by explicit AMI
30+
# ID — AWS resolves the actual AMI internally at node group creation.
31+
# Skipped here as they are not selected via direct image ID lookup.
32+
- "amazon-eks-node-*" # EKS-optimized AL2 / AL2023 node AMIs
33+
- "amazon-eks-gpu-node-*" # EKS-optimized GPU node AMIs (nvidia, neuron)
34+
- "bottlerocket-aws-k8s-*" # Bottlerocket OS AMIs for EKS node groups
35+
# ── EKS Auto Mode internal AMIs ───────────────────────────────────────
36+
# AWS-managed automatically in EKS Auto Mode; users cannot specify these
37+
# AMI IDs in launch templates or node groups. Variants: standard, nvidia,
38+
# neuron, amdgpu, amd. Pattern covers all K8s versions and architectures.
39+
- "eks-auto-*"
40+
# ── Mac dedicated-host AMIs ───────────────────────────────────────────────
41+
# Only usable on mac1/mac2 dedicated hardware, not standard EC2 instances.
42+
- "*amzn-ec2-macos*" # Amazon macOS AMIs (arm64_mac / x86_64_mac)
43+
- "*macos*sonoma*" # macOS Sonoma
44+
- "*macos*ventura*" # macOS Ventura
45+
- "*macos*monterey*" # macOS Monterey
46+
# ── Ubuntu pre-release / testing builds ───────────────────────────────────
47+
# Unstable daily or testing images — not suitable for production VM/EKS use.
48+
- "*images-testing*" # Ubuntu images-testing path (pre-release)
49+
- "*ubuntu*daily*" # Ubuntu daily builds
50+
# ── EOL operating systems ─────────────────────────────────────────────────
51+
# Past vendor end-of-life: no security patches available.
52+
- "*ubuntu*14.04*" # Ubuntu 14.04 LTS — EOL Apr 2019
53+
- "*ubuntu*16.04*" # Ubuntu 16.04 LTS — EOL Apr 2021
54+
- "*ubuntu*18.04*" # Ubuntu 18.04 LTS — EOL Apr 2023
55+
- "*-debian-9-*" # Debian 9 Stretch — EOL Jun 2022
56+
- "*debian*stretch*" # Debian 9 Stretch (name variant)
57+
- "*-debian-10-*" # Debian 10 Buster — EOL Jun 2024
58+
- "*debian*buster*" # Debian 10 Buster (name variant)
59+
- "*rhel-7*" # RHEL 7 — EOL Jun 2024
60+
- "*rhel7*" # RHEL 7 (no-dash variant)
61+
- "*sles-12*" # SUSE Linux Enterprise 12 — EOL Oct 2024
62+
- "*sles12*" # SUSE Linux Enterprise 12 (no-dash variant)
63+
regions: {}

conf/docker/conf/mc-infra-manager/assets/extractionpatterns.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,52 @@ extractionPatterns:
181181
- "caffe"
182182
- "machine learning"
183183
- "optimized-for-ml"
184+
185+
# GPU image exclusion patterns (case-insensitive, any match overrides gpuPatterns → not GPU)
186+
gpuExcludePatterns:
187+
- "nhncloud_allow_gpu_flavor:false" # NHN: property key indicating GPU NOT allowed
188+
- "workloads on vms that have attached gpus" # GCP: gVNIC description mentioning GPUs incidentally
189+
190+
# Rules for identifying basic GPU images per CSP
191+
# Follows the same include/exclude wildcard logic as basicImageRules
192+
basicGpuImageRules:
193+
common:
194+
include: []
195+
exclude:
196+
- "*windows*" # Exclude Windows-based GPU images from basic selection
197+
cspSpecific:
198+
aws:
199+
include:
200+
- "*deep learning*nvidia*gpu ami*ubuntu*" # AWS Deep Learning AMI (DLAMI) Ubuntu — single-VM GPU use
201+
gcp:
202+
include:
203+
- "*deeplearning-platform-release*" # Google Deep Learning VM (CUDA/PyTorch/TF)
204+
- "*ubuntu-os-accelerator-images*" # Ubuntu + NVIDIA driver
205+
- "*rocky-linux-accelerator-cloud*" # Rocky Linux + NVIDIA driver
206+
- "*ml-images*" # Google ML-optimized images
207+
azure:
208+
include:
209+
- "*microsoft-dsvm:ubuntu-hpc*" # Ubuntu HPC (GPU-optimized)
210+
- "*microsoft-dsvm:ubuntu-2004*" # DSVM Ubuntu 20.04
211+
- "*microsoft-dsvm:ubuntu-2204*" # DSVM Ubuntu 22.04
212+
ibm:
213+
include:
214+
- "*red hat enterprise linux ai*nvidia*" # RHEL AI for NVIDIA accelerators
215+
alibaba:
216+
include:
217+
- "*ubuntu*gpu*driver*cuda*" # Ubuntu with NVIDIA GPU Driver and CUDA
218+
ncp:
219+
include:
220+
- "*ubuntu*gpu*" # Ubuntu GPU image (e.g. ubuntu-24.04-gpu)
221+
- "*rocky*gpu*" # Rocky Linux GPU image
222+
kt:
223+
include:
224+
- "*ubuntu*gpusvr*" # KT GPU server Ubuntu images (CUDA pre-installed)
225+
- "*rocky*gpusvr*" # KT GPU server Rocky Linux images
226+
nhn:
227+
include:
228+
- "*ubuntu*nvidia*" # Ubuntu with NVIDIA driver
229+
- "*ubuntu*deep learning*" # Ubuntu Deep Learning image
184230

185231
# Kubernetes image identification patterns (case-insensitive, any match = Kubernetes)
186232
k8sPatterns:

conf/docker/conf/mc-infra-manager/assets/k8sclusterinfo.yaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,11 @@ k8scluster:
166166
- region: [ap-beijing, ap-chengdu, ap-chongqing, ap-guangzhou, ap-hongkong, ap-nanjing, ap-shanghai]
167167
- region: [common]
168168
available:
169-
- name: "1.30"
170-
id: "1.30.0"
171-
- name: "1.28"
172-
id: "1.28.3"
169+
# Updated: 2026-05-19 (1.30 EOM Feb-2026, 1.28 EOFS Apr-2026 — no new clusters)
170+
- name: "1.34"
171+
id: "1.34.1"
172+
- name: "1.32"
173+
id: "1.32.2"
173174
rootDisk:
174175
- region: [common]
175176
type:
@@ -206,15 +207,13 @@ k8scluster:
206207
requiredSubnetCount: 1
207208
version:
208209
- region: [common]
209-
available: # Updated: 2025-12-18 (verified from IBM Cloud API via CB-Spider)
210+
available: # Updated: 2026-06-12
211+
- name: "1.35"
212+
id: "1.35.5"
210213
- name: "1.34"
211-
id: "1.34.2"
214+
id: "1.34.8"
212215
- name: "1.33"
213-
id: "1.33.6"
214-
- name: "1.32"
215-
id: "1.32.10"
216-
- name: "1.31"
217-
id: "1.31.14"
216+
id: "1.33.12"
218217
rootDisk:
219218
- region: [common]
220219
type:

conf/docker/docker-compose.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
##### MC-INFRA-CONNECTOR #########################################################################################################################
2424

2525
mc-infra-connector:
26-
image: cloudbaristaorg/cb-spider:0.12.23
26+
image: cloudbaristaorg/cb-spider:0.12.30
2727
pull_policy: missing
2828
container_name: mc-infra-connector
2929
restart: unless-stopped
@@ -56,7 +56,7 @@ services:
5656
##### MC-INFRA-MANAGER #########################################################################################################################
5757

5858
mc-infra-manager:
59-
image: cloudbaristaorg/cb-tumblebug:0.12.12
59+
image: cloudbaristaorg/cb-tumblebug:0.12.15
6060
container_name: mc-infra-manager
6161
restart: unless-stopped
6262
pull_policy: missing
@@ -227,7 +227,7 @@ services:
227227

228228
# CB-MapUI is a Web-based test client (disable it for production use)
229229
cb-mapui:
230-
image: cloudbaristaorg/cb-mapui:0.12.34
230+
image: cloudbaristaorg/cb-mapui:0.12.39
231231
container_name: cb-mapui
232232
networks:
233233
- mc-infra-manager-network

0 commit comments

Comments
 (0)