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

Include HealthHost in v3.FelixConfigurationSpec #849

Merged
merged 2 commits into from Apr 12, 2018
Merged

Include HealthHost in v3.FelixConfigurationSpec #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d4f363
Make run-uts compatible with MacOS
renan Apr 10, 2018
1c71fec
Include HealthHost in v3.FelixConfigurationSpec
renan Apr 10, 2018
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
6 changes: 4 additions & 2 deletions lib/apis/v3/felixconfig.go
View file
Open in desktop
Expand Up @@ -152,8 +152,10 @@ type FelixConfigurationSpec struct {

DisableConntrackInvalidCheck *bool `json:"disableConntrackInvalidCheck,omitempty"`

HealthEnabled *bool `json:"healthEnabled,omitempty"`
HealthPort *int `json:"healthPort,omitempty"`
HealthEnabled *bool `json:"healthEnabled,omitempty"`
HealthHost *string `json:"healthHost,omitempty"`
HealthPort *int `json:"healthPort,omitempty"`

// PrometheusMetricsEnabled enables the experimental Prometheus metrics server in Felix if set to true. [Default: false]
PrometheusMetricsEnabled *bool `json:"prometheusMetricsEnabled,omitempty"`
// PrometheusMetricsPort is the TCP port that the experimental Prometheus metrics server should bind to. [Default:9091]
Expand Down
2 changes: 1 addition & 1 deletion lib/backend/syncersv1/updateprocessors/configurationprocessor_test.go
View file
Open in desktop
Expand Up @@ -70,7 +70,7 @@ var _ = Describe("Test the generic configuration update processor and the concre
Kind: apiv3.KindBGPConfiguration,
Name: "node.bgpnode1",
}
numFelixConfigs := 51
numFelixConfigs := 52
numClusterConfigs := 4
numNodeClusterConfigs := 3
numBgpConfigs := 3
Expand Down
2 changes: 2 additions & 0 deletions lib/clientv3/felixconfig_e2e_test.go
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ var _ = testutils.E2eDatastoreDescribe("FelixConfiguration tests", testutils.Dat
ptrFalse := false
ptrInt1 := 1432
ptrInt2 := 6341
hostString := "localhost"
spec1 := apiv3.FelixConfigurationSpec{
UseInternalDataplaneDriver: &ptrTrue,
DataplaneDriver: "test-dataplane-driver1",
Expand All @@ -50,6 +51,7 @@ var _ = testutils.E2eDatastoreDescribe("FelixConfiguration tests", testutils.Dat
spec2 := apiv3.FelixConfigurationSpec{
UseInternalDataplaneDriver: &ptrFalse,
DataplaneDriver: "test-dataplane-driver2",
HealthHost: &hostString,
HealthPort: &ptrInt2,
}

Expand Down
2 changes: 1 addition & 1 deletion run-uts
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ find . -name "*.coverprofile" -type f -delete
if [ -z $WHAT ]
then
echo "Calculating packages to cover..."
go_dirs=$(find -type f -name '*.go' | \
go_dirs=$(find . -type f -name '*.go' | \
grep -vE '/vendor/|.glide|.git' | \
xargs -n 1 dirname | \
sort | uniq | \
Expand Down