mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
commit
6fcdcec25d
@ -38,7 +38,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
|
|||||||
},
|
},
|
||||||
MinCount: 1,
|
MinCount: 1,
|
||||||
MaxCount: 5,
|
MaxCount: 5,
|
||||||
Target: expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
|
Target: expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -60,7 +60,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
|
|||||||
},
|
},
|
||||||
MinCount: -1,
|
MinCount: -1,
|
||||||
MaxCount: 5,
|
MaxCount: 5,
|
||||||
Target: expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
|
Target: expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"must be bigger or equal to minCount": {
|
"must be bigger or equal to minCount": {
|
||||||
@ -74,7 +74,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
|
|||||||
},
|
},
|
||||||
MinCount: 7,
|
MinCount: 7,
|
||||||
MaxCount: 5,
|
MaxCount: 5,
|
||||||
Target: expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
|
Target: expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"invalid value": {
|
"invalid value": {
|
||||||
@ -88,7 +88,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
|
|||||||
},
|
},
|
||||||
MinCount: 1,
|
MinCount: 1,
|
||||||
MaxCount: 5,
|
MaxCount: 5,
|
||||||
Target: expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("-0.8")},
|
Target: expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("-0.8")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"resource not supported": {
|
"resource not supported": {
|
||||||
@ -102,7 +102,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
|
|||||||
},
|
},
|
||||||
MinCount: 1,
|
MinCount: 1,
|
||||||
MaxCount: 5,
|
MaxCount: 5,
|
||||||
Target: expapi.TargetConsumption{api.ResourceName("NotSupportedResource"), resource.MustParse("0.8")},
|
Target: expapi.TargetConsumption{Resource: api.ResourceName("NotSupportedResource"), Quantity: resource.MustParse("0.8")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"required value": {
|
"required value": {
|
||||||
@ -113,7 +113,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
|
|||||||
Spec: expapi.HorizontalPodAutoscalerSpec{
|
Spec: expapi.HorizontalPodAutoscalerSpec{
|
||||||
MinCount: 1,
|
MinCount: 1,
|
||||||
MaxCount: 5,
|
MaxCount: 5,
|
||||||
Target: expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
|
Target: expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -239,14 +239,14 @@ func (proxier *Proxier) OnServiceUpdate(allServices []api.Service) {
|
|||||||
|
|
||||||
// if ClusterIP is "None" or empty, skip proxying
|
// if ClusterIP is "None" or empty, skip proxying
|
||||||
if !api.IsServiceIPSet(service) {
|
if !api.IsServiceIPSet(service) {
|
||||||
glog.V(3).Infof("Skipping service %s due to portal IP = %q", types.NamespacedName{service.Namespace, service.Name}, service.Spec.ClusterIP)
|
glog.V(3).Infof("Skipping service %s due to portal IP = %q", types.NamespacedName{Namespace: service.Namespace, Name: service.Name}, service.Spec.ClusterIP)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := range service.Spec.Ports {
|
for i := range service.Spec.Ports {
|
||||||
servicePort := &service.Spec.Ports[i]
|
servicePort := &service.Spec.Ports[i]
|
||||||
|
|
||||||
serviceName := proxy.ServicePortName{types.NamespacedName{service.Namespace, service.Name}, servicePort.Name}
|
serviceName := proxy.ServicePortName{NamespacedName: types.NamespacedName{Namespace: service.Namespace, Name: service.Name}, Port: servicePort.Name}
|
||||||
activeServices[serviceName] = true
|
activeServices[serviceName] = true
|
||||||
info, exists := proxier.serviceMap[serviceName]
|
info, exists := proxier.serviceMap[serviceName]
|
||||||
if exists && proxier.sameConfig(info, service, servicePort) {
|
if exists && proxier.sameConfig(info, service, servicePort) {
|
||||||
@ -317,7 +317,7 @@ func (proxier *Proxier) OnEndpointsUpdate(allEndpoints []api.Endpoints) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for portname := range portsToEndpoints {
|
for portname := range portsToEndpoints {
|
||||||
svcPort := proxy.ServicePortName{types.NamespacedName{svcEndpoints.Namespace, svcEndpoints.Name}, portname}
|
svcPort := proxy.ServicePortName{NamespacedName: types.NamespacedName{Namespace: svcEndpoints.Namespace, Name: svcEndpoints.Name}, Port: portname}
|
||||||
state, exists := proxier.serviceMap[svcPort]
|
state, exists := proxier.serviceMap[svcPort]
|
||||||
if !exists || state == nil {
|
if !exists || state == nil {
|
||||||
state = newServiceInfo(svcPort)
|
state = newServiceInfo(svcPort)
|
||||||
|
@ -67,7 +67,7 @@ func (eventStrategy) AllowUnconditionalUpdate() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func MatchEvent(label labels.Selector, field fields.Selector) generic.Matcher {
|
func MatchEvent(label labels.Selector, field fields.Selector) generic.Matcher {
|
||||||
return &generic.SelectionPredicate{label, field, getAttrs}
|
return &generic.SelectionPredicate{Label: label, Field: field, GetAttrs: getAttrs}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAttrs(obj runtime.Object) (objLabels labels.Set, objFields fields.Set, err error) {
|
func getAttrs(obj runtime.Object) (objLabels labels.Set, objFields fields.Set, err error) {
|
||||||
|
@ -65,7 +65,7 @@ func validNewHorizontalPodAutoscaler(name string) *expapi.HorizontalPodAutoscale
|
|||||||
},
|
},
|
||||||
MinCount: 1,
|
MinCount: 1,
|
||||||
MaxCount: 5,
|
MaxCount: 5,
|
||||||
Target: expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
|
Target: expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user