Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deployment: skip max unavailable if rolling update is unset #86

Merged
merged 1 commit into from
Feb 10, 2017
Merged

deployment: skip max unavailable if rolling update is unset #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ func (dc *deploymentCollector) collectDeployment(ch chan<- prometheus.Metric, d
addGauge(descDeploymentSpecReplicas, float64(*d.Spec.Replicas))
addGauge(descDeploymentMetadataGeneration, float64(d.ObjectMeta.Generation))

if d.Spec.Strategy.RollingUpdate == nil {
return
}

maxUnavailable, err := intstr.GetValueFromIntOrPercent(d.Spec.Strategy.RollingUpdate.MaxUnavailable, int(*d.Spec.Replicas), true)
if err != nil {
glog.Errorf("Error converting RollingUpdate MaxUnavailable to int: %s", err)
Expand Down
12 changes: 3 additions & 9 deletions deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ func TestDeploymentCollector(t *testing.T) {
Spec: v1beta1.DeploymentSpec{
Paused: true,
Replicas: &depl2Replicas,
Strategy: v1beta1.DeploymentStrategy{
RollingUpdate: &v1beta1.RollingUpdateDeployment{
MaxUnavailable: &depl2MaxUnavailable,
},
},
},
},
},
Expand All @@ -130,6 +125,9 @@ func TestDeploymentCollector(t *testing.T) {
kube_deployment_spec_paused{namespace="ns2",deployment="depl2"} 1
kube_deployment_spec_replicas{namespace="ns1",deployment="depl1"} 200
kube_deployment_spec_replicas{namespace="ns2",deployment="depl2"} 5
kube_deployment_spec_strategy_rollingupdate_max_unavailable{deployment="depl1",namespace="ns1"} 10
kube_deployment_status_observed_generation{namespace="ns1",deployment="depl1"} 111
kube_deployment_status_observed_generation{namespace="ns2",deployment="depl2"} 1111
kube_deployment_status_replicas{namespace="ns1",deployment="depl1"} 15
kube_deployment_status_replicas{namespace="ns2",deployment="depl2"} 10
kube_deployment_status_replicas_available{namespace="ns1",deployment="depl1"} 10
Expand All @@ -138,10 +136,6 @@ func TestDeploymentCollector(t *testing.T) {
kube_deployment_status_replicas_unavailable{namespace="ns2",deployment="depl2"} 0
kube_deployment_status_replicas_updated{namespace="ns1",deployment="depl1"} 2
kube_deployment_status_replicas_updated{namespace="ns2",deployment="depl2"} 1
kube_deployment_status_observed_generation{namespace="ns1",deployment="depl1"} 111
kube_deployment_status_observed_generation{namespace="ns2",deployment="depl2"} 1111
kube_deployment_spec_strategy_rollingupdate_max_unavailable{namespace="ns1",deployment="depl1"} 10
kube_deployment_spec_strategy_rollingupdate_max_unavailable{namespace="ns2",deployment="depl2"} 1
`,
},
}
Expand Down