Skip to content

fix: Ignore serviceSpec.ClusterIPs when comparing services to prevent endless routing reconciliation loop #504

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

Merged
merged 3 commits into from
Jul 28, 2021
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (

var serviceDiffOpts = cmp.Options{
cmpopts.IgnoreFields(corev1.Service{}, "TypeMeta", "ObjectMeta", "Status"),
cmpopts.IgnoreFields(corev1.ServiceSpec{}, "ClusterIP", "SessionAffinity"),
cmpopts.IgnoreFields(corev1.ServiceSpec{}, "ClusterIP", "ClusterIPs", "SessionAffinity"),
cmpopts.IgnoreFields(corev1.ServicePort{}, "TargetPort"),
cmpopts.SortSlices(func(a, b corev1.ServicePort) bool {
return strings.Compare(a.Name, b.Name) > 0
Expand Down

Large diffs are not rendered by default.

414 changes: 351 additions & 63 deletions deploy/deployment/kubernetes/combined.yaml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

414 changes: 351 additions & 63 deletions deploy/deployment/openshift/combined.yaml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

22 changes: 9 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,22 @@ go 1.15
require (
github.com/devfile/api/v2 v2.0.0-20210713124824-03e023e7078b
github.com/go-git/go-git/v5 v5.2.0
github.com/go-logr/logr v0.1.0
github.com/google/go-cmp v0.5.0
github.com/google/uuid v1.1.1
github.com/go-logr/logr v0.3.0
github.com/go-logr/zapr v0.3.0 // indirect
github.com/google/go-cmp v0.5.2
github.com/google/uuid v1.1.2
github.com/onsi/ginkgo v1.12.1
github.com/onsi/gomega v1.10.1
github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
github.com/redhat-cop/operator-utils v0.1.0
github.com/stretchr/testify v1.6.1
go.uber.org/zap v1.16.0 // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b // indirect
google.golang.org/protobuf v1.25.0 // indirect
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c // indirect
k8s.io/api v0.18.8
k8s.io/apiextensions-apiserver v0.18.8 // indirect
k8s.io/apimachinery v0.18.8
k8s.io/client-go v0.18.8
k8s.io/api v0.20.6
k8s.io/apiextensions-apiserver v0.20.6 // indirect
k8s.io/apimachinery v0.20.6
k8s.io/client-go v0.20.6
sigs.k8s.io/controller-runtime v0.6.3
sigs.k8s.io/yaml v1.2.0
)
368 changes: 322 additions & 46 deletions go.sum

Large diffs are not rendered by default.