This repository has been archived by the owner on Feb 27, 2023. It is now read-only.
Updates DaemonSet Name #64
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpeach
suggested changes
Oct 22, 2020
There was a problem hiding this comment.
# github.com/projectcontour/contour-operator/controller/contour
controller/contour/daemonset.go:209:27: undefined: httpPort
controller/contour/daemonset.go:210:27: undefined: httpPort
controller/contour/daemonset.go:215:27: undefined: httpsPort
controller/contour/daemonset.go:216:27: undefined: httpsPort
controller/contour/daemonset.go:258:34: undefined: xdsPort
# github.com/projectcontour/contour-operator/controller/contour
vet: controller/contour/daemonset.go:209:27: undeclared name: httpPort
Miciah
reviewed
Oct 22, 2020
controller/contour/daemonset.go
Outdated
| Ports: []corev1.ContainerPort{ | ||
| { | ||
| Name: "http", | ||
| ContainerPort: 80, | ||
| ContainerPort: int32(httpPort), | ||
| HostPort: int32(httpPort), |
There was a problem hiding this comment.
Do we need host ports? Seems like #52 (which adds a "LoadBalancer"-type service) obviates need for host ports or host networking.
There was a problem hiding this comment.
I don't think host ports are necessary, but they are specified upstream so I prefer to keep the definitions for the time being. I created #70 to address network endpoint publishing. Also see https://kubernetes.slack.com/archives/C8XRH2R4J/p1603393745340600.
|
@jpeach regarding #64 (review), this PR depends on #65 for port variables. |
|
@Miciah commit |
a7886ac
to
1443e8d
Compare
jpeach
suggested changes
Oct 23, 2020
There was a problem hiding this comment.
$ make test
/Users/jpeach/go/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
go fmt ./...
go vet ./...
/Users/jpeach/go/bin/controller-gen "crd:crdVersions=v1" rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
go test ./... -coverprofile cover.out
? github.com/projectcontour/contour-operator/api/v1alpha1 [no test files]
? github.com/projectcontour/contour-operator/cmd [no test files]
ok github.com/projectcontour/contour-operator/controller/contour 8.042s coverage: 67.5% of statements
? github.com/projectcontour/contour-operator/util [no test files]
--- FAIL: TestDaemonSetConfigChanged (0.00s)
--- FAIL: TestDaemonSetConfigChanged/if_probe_values_are_set_to_default_values (0.00s)
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x1c pc=0x1e68d5f]
goroutine 57 [running]:
testing.tRunner.func1.1(0x1f51fc0, 0x2a87130)
/usr/local/Cellar/go/1.15.3/libexec/src/testing/testing.go:1072 +0x30d
testing.tRunner.func1(0xc00049a180)
/usr/local/Cellar/go/1.15.3/libexec/src/testing/testing.go:1075 +0x41a
panic(0x1f51fc0, 0x2a87130)
/usr/local/Cellar/go/1.15.3/libexec/src/runtime/panic.go:969 +0x1b9
github.com/projectcontour/contour-operator/util/equality_test.TestDaemonSetConfigChanged.func8(0xc00049db00)
/Users/jpeach/upstream/contour-operator/util/equality/equality_test.go:115 +0x21f
github.com/projectcontour/contour-operator/util/equality_test.TestDaemonSetConfigChanged.func9(0xc00049a180)
/Users/jpeach/upstream/contour-operator/util/equality/equality_test.go:132 +0xa4
testing.tRunner(0xc00049a180, 0xc0004a25e0)
/usr/local/Cellar/go/1.15.3/libexec/src/testing/testing.go:1123 +0xef
created by testing.(*T).Run
/usr/local/Cellar/go/1.15.3/libexec/src/testing/testing.go:1168 +0x2b3
FAIL github.com/projectcontour/contour-operator/util/equality 1.513s
ok github.com/projectcontour/contour-operator/util/retryableerror 0.402s coverage: 100.0% of statements
? github.com/projectcontour/contour-operator/util/slice [no test files]
FAIL
make: *** [Makefile:18: test] Error 1
|
@jpeach commit |
Signed-off-by: Daneyon Hansen <[email protected]>
stevesloka
reviewed
Oct 26, 2020
| @@ -267,7 +274,7 @@ func DesiredDaemonSet(contour *operatorv1alpha1.Contour, contourImage, envoyImag | |||
| { | |||
| Name: envoyCfgVolName, | |||
| MountPath: filepath.Join("/", envoyCfgVolMntDir), | |||
| ReadOnly: true, | |||
| ReadOnly: false, | |||
There was a problem hiding this comment.
The init container needs to be able to write out the config. This logic follows the example here: https://github.com/projectcontour/contour/blob/main/examples/contour/03-envoy.yaml#L111-L113
There was a problem hiding this comment.
Ahh that makes sense. =) Thanks for clarifying @Miciah!
|
/lgtm |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the
DaemonSetname was derived fromcontour.Name + "envoy". This PR does the following:DaemonSetname with upstream until multipleContourinstances per namespace are supported.ReadinessProbefrom the shutdown-manager container to the envoy container (where it belongs).readOnly: falsefor Envoy's config volume (as it should be).Requires #65 for port variables.
/assign @jpeach @Miciah
/cc @stevesloka @skriss
Signed-off-by: Daneyon Hansen [email protected]