-
Notifications
You must be signed in to change notification settings - Fork 156
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
Implement adding config hash annotation to deployments #5418
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d1fd32a
Add annotation key constant
Warashi 74f2480
Add IsDeployment method to ResourceKey
Warashi 126f53a
Add AddStringMapValues method to Manifest
Warashi f01cd52
Implement config hash annotation to Kubernetes deployment manifests
Warashi 0b3e61d
Add unit tests for ResourceKey.IsDeployment method
Warashi ab992d6
Add unit tests for AddStringMapValues method in Manifest
Warashi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
110 changes: 110 additions & 0 deletions
110
pkg/app/pipedv1/plugin/kubernetes/deployment/annotate.go
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,110 @@ | ||
// Copyright 2024 The PipeCD 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 deployment | ||
|
||
import ( | ||
"github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/kubernetes/provider" | ||
) | ||
|
||
// annotateConfigHash appends a hash annotation into the workload manifests. | ||
// The hash value is calculated by hashing the content of all configmaps/secrets | ||
// that are referenced by the workload. | ||
// This appending ensures that the workload should be restarted when | ||
// one of its configurations changed. | ||
func annotateConfigHash(manifests []provider.Manifest) error { | ||
if len(manifests) == 0 { | ||
return nil | ||
} | ||
|
||
configMaps := make(map[string]provider.Manifest) | ||
secrets := make(map[string]provider.Manifest) | ||
for _, m := range manifests { | ||
if m.Key.IsConfigMap() { | ||
configMaps[m.Key.Name] = m | ||
continue | ||
} | ||
if m.Key.IsSecret() { | ||
secrets[m.Key.Name] = m | ||
} | ||
} | ||
|
||
// This application is not containing any config manifests | ||
// so nothing to do. | ||
if len(configMaps)+len(secrets) == 0 { | ||
return nil | ||
} | ||
|
||
for _, m := range manifests { | ||
if m.Key.IsDeployment() { | ||
if err := annotateConfigHashToWorkload(m, configMaps, secrets); err != nil { | ||
return err | ||
} | ||
|
||
// TODO: Add support for other workload types, such as StatefulSet, DaemonSet, etc. | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func annotateConfigHashToWorkload(m provider.Manifest, managedConfigMaps, managedSecrets map[string]provider.Manifest) error { | ||
configMaps := provider.FindReferencingConfigMaps(m.Body) | ||
secrets := provider.FindReferencingSecrets(m.Body) | ||
|
||
// The deployment is not referencing any config resources. | ||
if len(configMaps)+len(secrets) == 0 { | ||
return nil | ||
} | ||
|
||
cfgs := make([]provider.Manifest, 0, len(configMaps)+len(secrets)) | ||
for _, cm := range configMaps { | ||
m, ok := managedConfigMaps[cm] | ||
if !ok { | ||
// We do not return error here because the deployment may use | ||
// a config resource that is not managed by PipeCD. | ||
continue | ||
} | ||
cfgs = append(cfgs, m) | ||
} | ||
for _, s := range secrets { | ||
m, ok := managedSecrets[s] | ||
if !ok { | ||
// We do not return error here because the deployment may use | ||
// a config resource that is not managed by PipeCD. | ||
continue | ||
} | ||
cfgs = append(cfgs, m) | ||
} | ||
|
||
if len(cfgs) == 0 { | ||
return nil | ||
} | ||
|
||
hash, err := provider.HashManifests(cfgs) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
m.AddStringMapValues( | ||
map[string]string{ | ||
provider.AnnotationConfigHash: hash, | ||
}, | ||
"spec", | ||
"template", | ||
"metadata", | ||
"annotations", | ||
) | ||
return nil | ||
} |
Oops, something went wrong.
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.
I almost copied from below.
pipecd/pkg/app/piped/executor/kubernetes/kubernetes.go
Line 587 in e7cbc64