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

[release-4.6] Bug 1887339: Preserve labels and annotations during reconciliation #955

Merged
merged 3 commits into from
Oct 29, 2020
Merged

[release-4.6] Bug 1887339: Preserve labels and annotations during reconciliation #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8288d21
pkg/client,test/e2e: removing dead code
paulfantom Sep 28, 2020
c14d578
pkg/client: preserve labels and annotations during reconciliation; de…
paulfantom Oct 5, 2020
0458a19
vendor: revendor
paulfantom Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
215 changes: 113 additions & 102 deletions pkg/client/client.go
View file
Open in desktop

Large diffs are not rendered by default.

1,439 changes: 1,333 additions & 106 deletions pkg/client/client_test.go
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions test/e2e/multi_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package e2e

import (
"context"
"strconv"
"testing"
"time"
Expand All @@ -31,15 +32,15 @@ func TestMultinamespacePrometheusRule(t *testing.T) {
t.Parallel()

nsName := "openshift-test-prometheus-rules" + strconv.FormatInt(time.Now().Unix(), 36)

err := f.OperatorClient.CreateOrUpdateNamespace(&v1.Namespace{
ns := &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: nsName,
Labels: map[string]string{
"openshift.io/cluster-monitoring": "true",
},
},
})
}
_, err := f.KubeClient.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
if err != nil {
t.Fatal(err)
}
Expand Down
80 changes: 80 additions & 0 deletions ...or/github.com/coreos/prometheus-operator/pkg/client/versioned/fake/clientset_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/github.com/coreos/prometheus-operator/pkg/client/versioned/fake/doc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions vendor/github.com/coreos/prometheus-operator/pkg/client/versioned/fake/register.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions ...ithub.com/coreos/prometheus-operator/pkg/client/versioned/typed/monitoring/v1/fake/doc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

140 changes: 140 additions & 0 deletions ...os/prometheus-operator/pkg/client/versioned/typed/monitoring/v1/fake/fake_alertmanager.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.