Bump addon framework to the latest version (#551)

Signed-off-by: zhujian <jiazhu@redhat.com>
This commit is contained in:
Jian Zhu
2024-07-08 01:57:49 +00:00
committed by GitHub
parent cef27e2e4f
commit d1d871a566
5 changed files with 28 additions and 8 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ require (
k8s.io/klog/v2 v2.120.1
k8s.io/kube-aggregator v0.30.2
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
open-cluster-management.io/addon-framework v0.10.1-0.20240701065245-fa77e9b77a3b
open-cluster-management.io/addon-framework v0.10.1-0.20240703130731-ba7fd000a03a
open-cluster-management.io/api v0.14.1-0.20240627145512-bd6f2229b53c
open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566
sigs.k8s.io/controller-runtime v0.18.4
+2 -2
View File
@@ -459,8 +459,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
open-cluster-management.io/addon-framework v0.10.1-0.20240701065245-fa77e9b77a3b h1:5vtr57PKfsdg02n8fCcLN1vHfhL1LM6jnrp2KF8C77k=
open-cluster-management.io/addon-framework v0.10.1-0.20240701065245-fa77e9b77a3b/go.mod h1:C1VETu/CIQKYfMiVAgNzPEUHjCpL9P1Z/KsGhHa4kl4=
open-cluster-management.io/addon-framework v0.10.1-0.20240703130731-ba7fd000a03a h1:La1cYE3xkPFS2OJnsPQbkkahKE7yabuPcIISRfb4qsg=
open-cluster-management.io/addon-framework v0.10.1-0.20240703130731-ba7fd000a03a/go.mod h1:C1VETu/CIQKYfMiVAgNzPEUHjCpL9P1Z/KsGhHa4kl4=
open-cluster-management.io/api v0.14.1-0.20240627145512-bd6f2229b53c h1:gYfgkX/U6fv2d3Ly8D6N1GM9zokORupLSgCxx791zZw=
open-cluster-management.io/api v0.14.1-0.20240627145512-bd6f2229b53c/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566 h1:8dgPiM3byX/rtOrFJIsea2haV4hSFTND65Tlj1EdK18=
+1 -1
View File
@@ -1503,7 +1503,7 @@ k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/strings/slices
k8s.io/utils/trace
# open-cluster-management.io/addon-framework v0.10.1-0.20240701065245-fa77e9b77a3b
# open-cluster-management.io/addon-framework v0.10.1-0.20240703130731-ba7fd000a03a
## explicit; go 1.22.0
open-cluster-management.io/addon-framework/pkg/addonfactory
open-cluster-management.io/addon-framework/pkg/addonmanager
@@ -5,6 +5,7 @@ import (
"fmt"
"strings"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
@@ -178,10 +179,12 @@ func (s *healthCheckSyncer) probeAddonStatusByWorks(
// mark condition to unknown
if result == nil {
meta.SetStatusCondition(&addon.Status.Conditions, metav1.Condition{
Type: addonapiv1alpha1.ManagedClusterAddOnConditionAvailable,
Status: metav1.ConditionUnknown,
Reason: addonapiv1alpha1.AddonAvailableReasonNoProbeResult,
Message: "Probe results are not returned",
Type: addonapiv1alpha1.ManagedClusterAddOnConditionAvailable,
Status: metav1.ConditionUnknown,
Reason: addonapiv1alpha1.AddonAvailableReasonNoProbeResult,
Message: fmt.Sprintf("Probe results are not returned for %s/%s: %s/%s",
field.ResourceIdentifier.Group, field.ResourceIdentifier.Resource,
field.ResourceIdentifier.Namespace, field.ResourceIdentifier.Name),
})
return nil
}
@@ -271,8 +274,17 @@ func (s *healthCheckSyncer) analyzeWorkloadsWorkProber(
workloads := utils.FilterWorkloads(manifests)
for _, workload := range workloads {
// Not probe the deployment with zero replicas
if workload.GroupResource.Group == appsv1.GroupName &&
workload.GroupResource.Resource == "deployments" &&
workload.DeploymentSpec != nil &&
workload.DeploymentSpec.Replicas == 0 {
continue
}
manifestConfig := utils.WellKnowManifestConfig(workload.Group, workload.Resource,
workload.Namespace, workload.Name)
probeFields = append(probeFields, agent.ProbeField{
ResourceIdentifier: manifestConfig.ResourceIdentifier,
ProbeRules: manifestConfig.FeedbackRules,
@@ -134,6 +134,11 @@ func FilterDeployments(objects []runtime.Object) []*appsv1.Deployment {
type WorkloadMetadata struct {
schema.GroupResource
types.NamespacedName
DeploymentSpec *DeploymentSpec
}
type DeploymentSpec struct {
Replicas int32
}
func FilterWorkloads(objects []runtime.Object) []WorkloadMetadata {
@@ -150,6 +155,9 @@ func FilterWorkloads(objects []runtime.Object) []WorkloadMetadata {
Namespace: deployment.Namespace,
Name: deployment.Name,
},
DeploymentSpec: &DeploymentSpec{
Replicas: *deployment.Spec.Replicas,
},
})
}
daemonset, err := ConvertToDaemonSet(obj)