Fix issue #1668 about auto renew certificate on mutating / validating #1669
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // | ||
| // Copyright (c) 2019-2026 Red Hat, Inc. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| package infrastructure | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestCertManagerDetectedReturnsTrueWhenCertManagerInstalled(t *testing.T) { | ||
| InitializeForTestingWithCertManager(Kubernetes) | ||
| assert.True(t, CertManagerDetected()) | ||
| } | ||
|
|
||
| func TestCertManagerDetectedReturnsFalseWhenCertManagerNotInstalled(t *testing.T) { | ||
| InitializeForTesting(Kubernetes) | ||
| assert.False(t, CertManagerDetected()) | ||
| } | ||
|
|
||
| func TestCertManagerDetectedWithOpenShift(t *testing.T) { | ||
| InitializeForTestingWithCertManager(OpenShiftv4) | ||
| assert.True(t, CertManagerDetected()) | ||
| } | ||
|
|
||
| func TestCertManagerDetectedPanicsWhenNotInitialized(t *testing.T) { | ||
| initialized = false | ||
| defer func() { | ||
|
Contributor
There was a problem hiding this comment. Consider using |
||
| InitializeForTesting(Kubernetes) | ||
| }() | ||
| assert.Panics(t, func() { | ||
| CertManagerDetected() | ||
| }) | ||
| } | ||
|
|
||
| func TestInitializeForTestingSetsCertManagerDetectedToFalse(t *testing.T) { | ||
| InitializeForTesting(OpenShiftv4) | ||
| assert.False(t, CertManagerDetected()) | ||
| assert.True(t, IsOpenShift()) | ||
| } | ||
|
|
||
| func TestInitializeForTestingWithCertManagerSetsDetectedToTrue(t *testing.T) { | ||
| InitializeForTestingWithCertManager(Kubernetes) | ||
| assert.True(t, CertManagerDetected()) | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // | ||
| // Copyright (c) 2019-2026 Red Hat, Inc. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| package workspace | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/devfile/devworkspace-operator/pkg/infrastructure" | ||
| ) | ||
|
|
||
| func getWebhookAnnotations(namespace string) map[string]string { | ||
| annotations := map[string]string{} | ||
|
Contributor
There was a problem hiding this comment. Consider adding a brief comment here explaining why cert-manager takes priority over the OpenShift Service CA annotation. The ordering is intentional and correct, but without a comment a future maintainer may read the |
||
| if infrastructure.CertManagerDetected() { | ||
| annotations["cert-manager.io/inject-ca-from"] = fmt.Sprintf("%s/devworkspace-controller-serving-cert", namespace) | ||
| } else if infrastructure.IsOpenShift() { | ||
|
Contributor
There was a problem hiding this comment. Consider extracting |
||
| annotations["service.beta.openshift.io/inject-cabundle"] = "true" | ||
| } | ||
| return annotations | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // | ||
| // Copyright (c) 2019-2026 Red Hat, Inc. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| package workspace | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/devfile/devworkspace-operator/pkg/infrastructure" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestGetWebhookAnnotationsWithCertManager(t *testing.T) { | ||
| infrastructure.InitializeForTestingWithCertManager(infrastructure.Kubernetes) | ||
| annotations := getWebhookAnnotations("test-namespace") | ||
| assert.Equal(t, map[string]string{ | ||
| "cert-manager.io/inject-ca-from": "test-namespace/devworkspace-controller-serving-cert", | ||
| }, annotations) | ||
| } | ||
|
|
||
| func TestGetWebhookAnnotationsWithOpenShift(t *testing.T) { | ||
| infrastructure.InitializeForTesting(infrastructure.OpenShiftv4) | ||
| annotations := getWebhookAnnotations("test-namespace") | ||
| assert.Equal(t, map[string]string{ | ||
| "service.beta.openshift.io/inject-cabundle": "true", | ||
| }, annotations) | ||
| } | ||
|
|
||
| func TestGetWebhookAnnotationsWithKubernetes(t *testing.T) { | ||
| infrastructure.InitializeForTesting(infrastructure.Kubernetes) | ||
| annotations := getWebhookAnnotations("test-namespace") | ||
| assert.Empty(t, annotations) | ||
| } | ||
|
|
||
| func TestGetWebhookAnnotationsWithCertManagerOnOpenShift(t *testing.T) { | ||
| infrastructure.InitializeForTestingWithCertManager(infrastructure.OpenShiftv4) | ||
| annotations := getWebhookAnnotations("test-namespace") | ||
| assert.Equal(t, map[string]string{ | ||
| "cert-manager.io/inject-ca-from": "test-namespace/devworkspace-controller-serving-cert", | ||
| }, annotations) | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it make sense to move the
certManagerDetectedassignment intoInitialize()alongside thedetect()call, rather than insidedetect()as a side effect? The function's name and(Type, error)return type suggest it only determines the cluster type, so the hidden side effect is a bit surprising. It also makesdetect()harder to test in isolation and is architecturally inconsistent with how OpenShift detection works (returned as a value, not a side effect). One option: return a richer struct fromdetect()(e.g.,DetectionResult{InfraType, CertManagerAvailable}) or call a separate function fromInitialize().