-
Notifications
You must be signed in to change notification settings - Fork 419
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[target allocator] Restart target allocator when config changes (#1889)
* Move target allocator ConfigMap to the targetallocator package * Restart target allocator when config changes * Use the right collector selector labels for TA
- Loading branch information
Mikołaj Świątek
committed
Jul 13, 2023
1 parent
02b4d30
commit ecebb74
Showing
13 changed files
with
407 additions
and
162 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
| change_type: enhancement | ||
|
|
||
| # The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action) | ||
| component: target allocator | ||
|
|
||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Restart target allocator when its configuration changes | ||
|
|
||
| # One or more tracking issues related to the change | ||
| issues: [1882] | ||
|
|
||
| # (Optional) One or more lines of additional information to render under the primary note. | ||
| # These lines will be padded with 2 spaces and then inserted directly into the document. | ||
| # Use pipe (|) for multiline entries. | ||
| subtext: |
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // 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 targetallocator | ||
|
|
||
| import ( | ||
| "crypto/sha256" | ||
| "fmt" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
|
|
||
| "github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1" | ||
| ) | ||
|
|
||
| const configMapHashAnnotationKey = "opentelemetry-targetallocator-config/hash" | ||
|
|
||
| // Annotations returns the annotations for the TargetAllocator Pod. | ||
| func Annotations(instance v1alpha1.OpenTelemetryCollector) map[string]string { | ||
| // Make a copy of PodAnnotations to be safe | ||
| annotations := make(map[string]string, len(instance.Spec.PodAnnotations)) | ||
| for key, value := range instance.Spec.PodAnnotations { | ||
| annotations[key] = value | ||
| } | ||
|
|
||
| configMap, err := ConfigMap(instance) | ||
| if err == nil { | ||
| annotations[configMapHashAnnotationKey] = getConfigMapSHA(configMap) | ||
| } | ||
|
|
||
| return annotations | ||
| } | ||
|
|
||
| // getConfigMapSHA returns the hash of the content of the TA ConfigMap. | ||
| func getConfigMapSHA(configMap v1.ConfigMap) string { | ||
| configBytes := configMap.BinaryData[targetAllocatorFilename] | ||
| h := sha256.Sum256(configBytes) | ||
| return fmt.Sprintf("%x", h) | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // 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 targetallocator | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestPodAnnotations(t *testing.T) { | ||
| instance := collectorInstance() | ||
| instance.Spec.PodAnnotations = map[string]string{ | ||
| "key": "value", | ||
| } | ||
| annotations := Annotations(instance) | ||
| assert.Subset(t, annotations, instance.Spec.PodAnnotations) | ||
| } | ||
|
|
||
| func TestConfigMapHash(t *testing.T) { | ||
| instance := collectorInstance() | ||
| annotations := Annotations(instance) | ||
| require.Contains(t, annotations, configMapHashAnnotationKey) | ||
| cmHash := annotations[configMapHashAnnotationKey] | ||
| assert.Len(t, cmHash, 64) | ||
| } | ||
|
|
||
| func TestInvalidConfigNoHash(t *testing.T) { | ||
| instance := collectorInstance() | ||
| instance.Spec.Config = "" | ||
| annotations := Annotations(instance) | ||
| require.NotContains(t, annotations, configMapHashAnnotationKey) | ||
| } |
Oops, something went wrong.