From dfe1089e5766ec9fbd5364d7b31ccdded93c3c8a Mon Sep 17 00:00:00 2001 From: Pratham Date: Sat, 22 Mar 2025 01:08:24 +0530 Subject: [PATCH 1/4] ci issue Signed-off-by: Pratham --- .github/dependabot.yml | 12 ++++++------ .github/workflows/ci-image-scanning-on-schedule.yml | 2 +- .github/workflows/ci-schedule-compatibility.yaml | 2 +- operator/config/samples/karmada.yaml | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 910a48158..31f5b4a90 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,6 +17,12 @@ updates: schedule: interval: weekly +- package-ecosystem: docker + directory: /cluster/images/ + target-branch: "release-1.13" + schedule: + interval: weekly + - package-ecosystem: docker directory: /cluster/images/ target-branch: "release-1.12" @@ -28,9 +34,3 @@ updates: target-branch: "release-1.11" schedule: interval: weekly - -- package-ecosystem: docker - directory: /cluster/images/ - target-branch: "release-1.10" - schedule: - interval: weekly diff --git a/.github/workflows/ci-image-scanning-on-schedule.yml b/.github/workflows/ci-image-scanning-on-schedule.yml index e94a396a0..1ed59753d 100644 --- a/.github/workflows/ci-image-scanning-on-schedule.yml +++ b/.github/workflows/ci-image-scanning-on-schedule.yml @@ -27,7 +27,7 @@ jobs: - karmada-search - karmada-operator - karmada-metrics-adapter - karmada-version: [ release-1.12, release-1.11, release-1.10 ] + karmada-version: [ release-1.13, release-1.12, release-1.11 ] steps: - name: checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/ci-schedule-compatibility.yaml b/.github/workflows/ci-schedule-compatibility.yaml index e0b0cd1c8..ad364d190 100644 --- a/.github/workflows/ci-schedule-compatibility.yaml +++ b/.github/workflows/ci-schedule-compatibility.yaml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: kubeapiserver-version: [ v1.23.4, v1.24.2, v1.25.0, v1.26.0, v1.27.3, v1.28.0, v1.29.0, v1.30.0, v1.31.0 ] - karmada-version: [ master, release-1.12, release-1.11, release-1.10 ] + karmada-version: [ master, release-1.13, release-1.12, release-1.11 ] env: KARMADA_APISERVER_VERSION: ${{ matrix.kubeapiserver-version }} steps: diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index b84930db9..b77f337e1 100644 --- a/operator/config/samples/karmada.yaml +++ b/operator/config/samples/karmada.yaml @@ -34,19 +34,19 @@ spec: serviceSubnet: 10.96.0.0/12 karmadaAggregatedAPIServer: imageRepository: docker.io/karmada/karmada-aggregated-apiserver - imageTag: v1.12.2 + imageTag: v1.13.0 replicas: 1 karmadaControllerManager: imageRepository: docker.io/karmada/karmada-controller-manager - imageTag: v1.12.2 + imageTag: v1.13.0 replicas: 1 karmadaScheduler: imageRepository: docker.io/karmada/karmada-scheduler - imageTag: v1.12.2 + imageTag: v1.13.0 replicas: 1 karmadaWebhook: imageRepository: docker.io/karmada/karmada-webhook - imageTag: v1.12.2 + imageTag: v1.13.0 replicas: 1 kubeControllerManager: imageRepository: registry.k8s.io/kube-controller-manager @@ -54,7 +54,7 @@ spec: replicas: 1 karmadaMetricsAdapter: imageRepository: docker.io/karmada/karmada-metrics-adapter - imageTag: v1.12.2 + imageTag: v1.13.0 replicas: 2 # karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting # imageRepository: docker.io/karmada/karmada-search From a846783aaa09d4846f5de2fb3a7869c6d5621be0 Mon Sep 17 00:00:00 2001 From: Pratham Date: Sat, 22 Mar 2025 13:38:01 +0530 Subject: [PATCH 2/4] karmada version update Signed-off-by: Pratham --- operator/config/samples/karmada.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index b77f337e1..64a414081 100644 --- a/operator/config/samples/karmada.yaml +++ b/operator/config/samples/karmada.yaml @@ -56,14 +56,14 @@ spec: imageRepository: docker.io/karmada/karmada-metrics-adapter imageTag: v1.13.0 replicas: 2 - # karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting - # imageRepository: docker.io/karmada/karmada-search - # imageTag: v1.12.2 - # replicas: 1 - # karmadaDescheduler: # the component `KarmadaDescheduler` is not installed by default, if you need to install it, uncomment it and note the formatting - # imageRepository: docker.io/karmada/karmada-descheduler - # imageTag: v1.12.2 - # replicas: 1 + karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting + imageRepository: docker.io/karmada/karmada-search + imageTag: v1.13.0 + replicas: 1 + karmadaDescheduler: # the component `KarmadaDescheduler` is not installed by default, if you need to install it, uncomment it and note the formatting + imageRepository: docker.io/karmada/karmada-descheduler + imageTag: v1.13.0 + replicas: 1 hostCluster: networking: dnsDomain: cluster.local From 38619e9ffed1cafa12e9042565530d557dbf8c1d Mon Sep 17 00:00:00 2001 From: Pratham Date: Mon, 24 Mar 2025 22:15:02 +0530 Subject: [PATCH 3/4] documentation and ci update Signed-off-by: Pratham --- operator/config/samples/karmada.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index 64a414081..1a50faabe 100644 --- a/operator/config/samples/karmada.yaml +++ b/operator/config/samples/karmada.yaml @@ -56,14 +56,14 @@ spec: imageRepository: docker.io/karmada/karmada-metrics-adapter imageTag: v1.13.0 replicas: 2 - karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting - imageRepository: docker.io/karmada/karmada-search - imageTag: v1.13.0 - replicas: 1 - karmadaDescheduler: # the component `KarmadaDescheduler` is not installed by default, if you need to install it, uncomment it and note the formatting - imageRepository: docker.io/karmada/karmada-descheduler - imageTag: v1.13.0 - replicas: 1 + # karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting + # imageRepository: docker.io/karmada/karmada-search + # imageTag: v1.13.0 + # replicas: 1 + # karmadaDescheduler: # the component `KarmadaDescheduler` is not installed by default, if you need to install it, uncomment it and note the formatting + # imageRepository: docker.io/karmada/karmada-descheduler + # imageTag: v1.13.0 + # replicas: 1 hostCluster: networking: dnsDomain: cluster.local From c0657e289e1fff2809043ab970c90ceac166bbde Mon Sep 17 00:00:00 2001 From: Pratham Date: Thu, 27 Mar 2025 01:30:01 +0530 Subject: [PATCH 4/4] corrected the intention of the commented code Signed-off-by: Pratham --- operator/config/samples/karmada.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index 1a50faabe..466eb588a 100644 --- a/operator/config/samples/karmada.yaml +++ b/operator/config/samples/karmada.yaml @@ -57,13 +57,13 @@ spec: imageTag: v1.13.0 replicas: 2 # karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting - # imageRepository: docker.io/karmada/karmada-search - # imageTag: v1.13.0 - # replicas: 1 + # imageRepository: docker.io/karmada/karmada-search + # imageTag: v1.13.0 + # replicas: 1 # karmadaDescheduler: # the component `KarmadaDescheduler` is not installed by default, if you need to install it, uncomment it and note the formatting - # imageRepository: docker.io/karmada/karmada-descheduler - # imageTag: v1.13.0 - # replicas: 1 + # imageRepository: docker.io/karmada/karmada-descheduler + # imageTag: v1.13.0 + # replicas: 1 hostCluster: networking: dnsDomain: cluster.local