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.

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

cld-6745: Upgrade metrics-server to app version 0.6.4 #991

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions internal/api/request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestNewCreateClusterRequestFromReader(t *testing.T) {
"promtail": {Chart: "6.2.2", ValuesPath: ""},
"rtcd": {Chart: "1.3.0", ValuesPath: ""},
"node-problem-detector": {Chart: "2.3.5", ValuesPath: ""},
"metrics-server": {Chart: "3.10.0", ValuesPath: ""},
"metrics-server": {Chart: "3.11.0", ValuesPath: ""},
"velero": {Chart: "3.1.2", ValuesPath: ""},
"cloudprober": {Chart: "0.1.3", ValuesPath: ""},
},
Expand Down Expand Up @@ -108,7 +108,7 @@ func TestNewCreateClusterRequestFromReader(t *testing.T) {
"promtail": {Chart: "6.2.2", ValuesPath: ""},
"rtcd": {Chart: "1.3.0", ValuesPath: ""},
"node-problem-detector": {Chart: "2.3.5", ValuesPath: ""},
"metrics-server": {Chart: "3.10.0", ValuesPath: ""},
"metrics-server": {Chart: "3.11.0", ValuesPath: ""},
"velero": {Chart: "3.1.2", ValuesPath: ""},
"cloudprober": {Chart: "0.1.3", ValuesPath: ""},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/provisioner/utility/metrics_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestNewHelmDeploymentWithDefaultConfigurationMetricsServer(t *testing.T) {
defer ctrl.Finish()

logger := log.New()
metricsServer := newMetricsServerHandle(&model.HelmUtilityVersion{Chart: "3.10.0"}, &model.Cluster{
metricsServer := newMetricsServerHandle(&model.HelmUtilityVersion{Chart: "3.11.0"}, &model.Cluster{
UtilityMetadata: &model.UtilityMetadata{
ActualVersions: model.UtilityGroupVersions{},
},
Expand Down
2 changes: 1 addition & 1 deletion model/cluster_utility.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var DefaultUtilityVersions map[string]*HelmUtilityVersion = map[string]*HelmUtil
// NodeProblemDetectorCanonicalName defines the default version and values path for the Helm chart
NodeProblemDetectorCanonicalName: {Chart: "2.3.5", ValuesPath: ""},
// MetricsServerCanonicalName defines the default version and values path for the Helm chart
MetricsServerCanonicalName: {Chart: "3.10.0", ValuesPath: ""},
MetricsServerCanonicalName: {Chart: "3.11.0", ValuesPath: ""},
// VeleroCanonicalName defines the default version for the Helm chart
VeleroCanonicalName: {Chart: "3.1.2", ValuesPath: ""},
// CloudproberCanonicalName defines the default version for the Helm chart
Expand Down
6 changes: 3 additions & 3 deletions model/cluster_utility_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func TestGetActualVersion(t *testing.T) {
Promtail: &HelmUtilityVersion{Chart: "promtail-6.2.2"},
Rtcd: &HelmUtilityVersion{Chart: "rtcd-1.3.0"},
NodeProblemDetector: &HelmUtilityVersion{Chart: "node-problem-detector-2.3.5"},
MetricsServer: &HelmUtilityVersion{Chart: "metrics-server-3.10.0"},
MetricsServer: &HelmUtilityVersion{Chart: "metrics-server-3.11.0"},
Velero: &HelmUtilityVersion{Chart: "velero-3.1.2"},
Cloudprober: &HelmUtilityVersion{Chart: "cloudprober-0.1.3"},
},
Expand Down Expand Up @@ -188,7 +188,7 @@ func TestGetActualVersion(t *testing.T) {
assert.Equal(t, &HelmUtilityVersion{Chart: "node-problem-detector-2.3.5"}, version)

version = c.ActualUtilityVersion(MetricsServerCanonicalName)
assert.Equal(t, &HelmUtilityVersion{Chart: "metrics-server-3.10.0"}, version)
assert.Equal(t, &HelmUtilityVersion{Chart: "metrics-server-3.11.0"}, version)

version = c.ActualUtilityVersion(VeleroCanonicalName)
assert.Equal(t, &HelmUtilityVersion{Chart: "velero-3.1.2"}, version)
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestGetDesiredVersion(t *testing.T) {
Promtail: &HelmUtilityVersion{Chart: "promtail-6.2.2"},
Rtcd: &HelmUtilityVersion{Chart: "rtcd-1.3.0"},
NodeProblemDetector: &HelmUtilityVersion{Chart: "node-problem-detector-2.3.5"},
MetricsServer: &HelmUtilityVersion{Chart: "metrics-server-3.10.0"},
MetricsServer: &HelmUtilityVersion{Chart: "metrics-server-3.11.0"},
Velero: &HelmUtilityVersion{Chart: "velero-3.1.2"},
Cloudprober: &HelmUtilityVersion{Chart: "cloudprober-0.1.3"},
},
Expand Down