Skip to content

delete duplicate image names and add default configuration#2819

Merged
ks-ci-bot merged 2 commits intokubesphere:mainfrom
yangjinheng:dev-yangjinheng
Oct 29, 2025
Merged

delete duplicate image names and add default configuration#2819
ks-ci-bot merged 2 commits intokubesphere:mainfrom
yangjinheng:dev-yangjinheng

Conversation

@yangjinheng
Copy link
Copy Markdown
Contributor

@yangjinheng yangjinheng commented Oct 22, 2025 •
edited by redscholar
Loading

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for reviewers:

Does this PR introduced a user-facing change?

delete duplicate image names and add default configuration

Additional documentation, usage docs, etc.:

@kubesphere-prow
Copy link
Copy Markdown

kubesphere-prow bot commented Oct 22, 2025

Welcome @yangjinheng! It looks like this is your first PR to kubesphere/kubekey 🎉

@kubesphere-prow kubesphere-prow bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 22, 2025
@yangjinheng
Copy link
Copy Markdown
Contributor Author

yangjinheng commented Oct 22, 2025

fixed some things that I thought were weird.

@yangjinheng
Copy link
Copy Markdown
Contributor Author

yangjinheng commented Oct 22, 2025

The cilium_version in the configuration file is outdated and the official repository no longer has that version.

@yangjinheng
Copy link
Copy Markdown
Contributor Author

yangjinheng commented Oct 22, 2025 

# cilium helm values
image:
  repository: quay.io/cilium/cilium
  tag: "v1.18.2"
  digest: "sha256:858f807ea4e20e85e3ea3240a762e1f4b29f1cb5bbd0463b8aa77e7b097c0667"
certgen:
  image:
    repository: quay.io/cilium/certgen
    tag: "v0.2.4"
    digest: "sha256:de7b97b1d19a34b674d0c4bc1da4db999f04ae355923a9a994ac3a81e1a1b5ff"
hubble:
  relay:
    image:
      repository: quay.io/cilium/hubble-relay-ci
      tag: "v1.18"
      digest: "sha256:ad2e2bbc3a4c0d598245309609d26aea5ba7ea21dd94d245e78c4c773df8bc88"
  ui:
    backend:
      image:
        repository: quay.io/cilium/hubble-ui-backend
        tag: "v0.13.3"
        digest: "sha256:db1454e45dc39ca41fbf7cad31eec95d99e5b9949c39daaad0fa81ef29d56953"
    frontend:
      image:
        repository: quay.io/cilium/hubble-ui
        tag: "v0.13.3"
        digest: "sha256:661d5de7050182d495c6497ff0b007a7a1e379648e60830dd68c4d78ae21761d"
envoy:
  image:
    repository: quay.io/cilium/cilium-envoy
    tag: "v1.35-cb5737105ff9a4ca5d080c0c8f3ea1bfdc08de83"
    digest: "sha256:808c986a99e2a1ea9785b49604a1ccd1e1cdc21d4b7a2ff1236cc31788ea9b45"
operator:
  replicas: 2
  image:
    repository: quay.io/cilium/operator
    tag: "v1.18.2"
    digest: "sha256:0f234ce2ab0f30c09f4f9fe1b9c6323f0c6b66d789bef5e958fce7cff85960f3"
nodeinit:
  image:
    repository: quay.io/cilium/startup-script
    tag: "1755531540-60ee83e-20250916"
    digest: "sha256:5bdca3c2dec2c79f58d45a7a560bf1098c2126350c901379fe850b7f78d3d757"
preflight:
  image:
    repository: quay.io/cilium/cilium-ci
    tag: "v1.18"
    digest: "sha256:1273dd1a8deedc07caf9f44f53b724b13a3c708d1f31bd59593bcf004df50a71"
clustermesh:
  apiserver:
    image:
      repository: quay.io/cilium/clustermesh-apiserver-ci
      tag: "v1.18"
      digest: "sha256:fe8e3bac6c4219b71d4f7a94a66f57cfafc65070453e4c4aa94b787bd15eb3fe"
authentication:
  mutual:
    spire:
      install:
        initImage:
          repository: docker.io/library/busybox
          tag: "1.37.0"
          digest: "sha256:ab33eacc8251e3807b85bb6dba570e4698c3998eca6f0fc2ccb60575a563ea74"
      agent:
        image:
          repository: ghcr.io/spiffe/spire-agent
          tag: "1.12.4"
          digest: "sha256:163970884fba18860cac93655dc32b6af85a5dcf2ebb7e3e119a10888eff8fcd"
      server:
        image:
          repository: ghcr.io/spiffe/spire-server
          tag: "1.12.4"
          digest: "sha256:34147f27066ab2be5cc10ca1d4bfd361144196467155d46c45f3519f41596e49"
ipv4:
  enabled: true
ipv6:
  enabled: false
ipam:
  operator:
    clusterPoolIPv4PodCIDRList:
      - 10.233.64.0/18
    clusterPoolIPv4MaskSize: 24

It took me a long time to install cilium

@redscholar
Copy link
Copy Markdown
Contributor

redscholar commented Oct 22, 2025

For Kubernetes versions v1.23 to v1.33, we provide a default configuration file for each minor version:

  • builtin/core/defaults/config/v1.xx.yaml
    • Purpose: Shows which default parameters are used for that Kubernetes version. It is for display only and does not directly affect task execution.
    • Usage scenarios:
    1. Run kk create config --with-kubernetes v1.33.0 -o . to get config-v1.33.0.yaml, which can be updated as needed.
    2. Run kk create cluster -f config-v1.33.0.yaml to create a cluster using that config.
  • builtin/core/roles/defaults/vars/v1.xx.yaml
    • Purpose: Contains the actual default parameters used when no config file is specified.
    • Usage scenario:
      Run kk create cluster --with-kubernetes v1.33.0 without specifying a config file; these defaults will be applied.

@redscholar
Copy link
Copy Markdown
Contributor

redscholar commented Oct 22, 2025 •
edited
Loading

You probably want to update the cni.cilium_version in each v1.xx.yaml file and in builtin/core/roles/defaults/defaults/main/04-cni.yaml.

@yangjinheng
Copy link
Copy Markdown
Contributor Author

yangjinheng commented Oct 24, 2025

您可能想要更新cni.cilium_version每个 v1.xx.yaml 文件和 builtin/core/roles/defaults/defaults/main/04-cni.yaml。

yes

@zuoxuesong-worker
Copy link
Copy Markdown
Contributor

zuoxuesong-worker commented Oct 24, 2025

i saw you delete some images in each v1.xx.yaml,have you tried creating a Kubernetes cluster with your updated configuration and using only the images specified in the configuration?
you want to update cni.cilium_version , could you please tell me the reason?

@redscholar
Copy link
Copy Markdown
Contributor

redscholar commented Oct 28, 2025

@yangjinheng I checked Cilium’s official website. kubernetes compatibility like this:

cilium version kubernetes version source
v1.14 1.19, 1.20, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, 1.27 https://docs.cilium.io/en/v1.14/network/kubernetes/compatibility/
v1.15 1.26, 1.27, 1.28, 1.29 https://docs.cilium.io/en/v1.15/network/kubernetes/compatibility/
v1.16 1.27, 1.28, 1.29, 1.30 https://docs.cilium.io/en/v1.16/network/kubernetes/compatibility/
v1.17 1.29, 1.30, 1.31, 1.32 https://docs.cilium.io/en/v1.17/network/kubernetes/compatibility/
v1.18 1.30, 1.31, 1.32, 1.33 https://docs.cilium.io/en/v1.18/network/kubernetes/compatibility/

If you don’t have time, I’ll continue making changes in your PR.

@kubesphere-prow
Copy link
Copy Markdown

kubesphere-prow bot commented Oct 28, 2025

This PR has multiple commits, and the default merge method is: squash.
You can request commits to be merged using the label: tide/merge-method-merge

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@kubesphere-prow kubesphere-prow bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. do-not-merge/release-note-label-needed labels Oct 28, 2025
yangjinheng and others added 2 commits October 29, 2025 10:40
@redscholar
delete duplicate image names and add default configuration
ecca4ca 
Signed-off-by: redscholar <blacktiledhouse@gmail.com>
@redscholar
Update CNI configurations and image manifests across multiple versions
0eff1c7 
- Updated Cilium version to 1.18.3 in various configuration files.
- Added Calico control plane images (ctl and typha) to image manifests for consistency.
- Ensured proper formatting for kube_version placeholders in YAML files.
- Removed duplicate image entries and ensured all necessary images are included in the manifests.

Signed-off-by: redscholar <blacktiledhouse@gmail.com>
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Oct 29, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@redscholar
Copy link
Copy Markdown
Contributor

redscholar commented Oct 29, 2025

/lgtm

@kubesphere-prow kubesphere-prow bot added the lgtm Indicates that a PR is ready to be merged. label Oct 29, 2025
@redscholar
Copy link
Copy Markdown
Contributor

redscholar commented Oct 29, 2025

/approve

@kubesphere-prow
Copy link
Copy Markdown

kubesphere-prow bot commented Oct 29, 2025

LGTM label has been added.

DetailsGit tree hash: 02da0fea0688f8e6e37657774c762167e030cf8d

@kubesphere-prow
Copy link
Copy Markdown

kubesphere-prow bot commented Oct 29, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: redscholar, yangjinheng

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubesphere-prow kubesphere-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 29, 2025
@ks-ci-bot ks-ci-bot merged commit 2776e10 into kubesphere:main Oct 29, 2025
4 checks passed
@yangjinheng
Copy link
Copy Markdown
Contributor Author

yangjinheng commented Oct 29, 2025

i am quite busy recently, thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zuoxuesong-worker zuoxuesong-worker Awaiting requested review from zuoxuesong-worker

Assignees

@redscholar redscholar

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yangjinheng @redscholar @zuoxuesong-worker @ks-ci-bot