-
Notifications
You must be signed in to change notification settings - Fork 408
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
add StaticPod CRD and controller #1261
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
075b7cb
add StaticPod CRD and controller
xavier-hou 06c3d41
adjust static pod CRD spec
xavier-hou 8113e4c
adopt new framework of yurt-manager
xavier-hou f5ce8b6
fix webhook default and validate
xavier-hou ceca2e2
remove condition from staticpod status
xavier-hou 5dace86
add parameter upgrade-worker-image to specify image of worker pod
xavier-hou 794f589
verify upgrade status by worker pod
xavier-hou bbccaaf
add readyNumber field in CRD status
xavier-hou 21a0a45
add Event message when upgrade failed
xavier-hou d5a8e61
remove issuing manifest from controller
xavier-hou ef97ba8
modify api groups
xavier-hou 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
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,64 @@ | ||
/* | ||
Copyright 2023 The OpenYurt 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 options | ||
|
||
import ( | ||
"github.com/spf13/pflag" | ||
|
||
"github.com/openyurtio/openyurt/pkg/controller/staticpod/config" | ||
) | ||
|
||
const DefaultUpgradeWorkerImage = "openyurt/node-servant:latest" | ||
|
||
type StaticPodControllerOptions struct { | ||
*config.StaticPodControllerConfiguration | ||
} | ||
|
||
func NewStaticPodControllerOptions() *StaticPodControllerOptions { | ||
return &StaticPodControllerOptions{ | ||
&config.StaticPodControllerConfiguration{ | ||
UpgradeWorkerImage: DefaultUpgradeWorkerImage, | ||
}, | ||
} | ||
} | ||
|
||
// AddFlags adds flags related to staticpod for yurt-manager to the specified FlagSet. | ||
func (o *StaticPodControllerOptions) AddFlags(fs *pflag.FlagSet) { | ||
if o == nil { | ||
return | ||
} | ||
|
||
fs.StringVar(&o.UpgradeWorkerImage, "upgrade-worker-image", o.UpgradeWorkerImage, "Specify the worker pod image used for static pod upgrade.") | ||
} | ||
|
||
// ApplyTo fills up staticpod config with options. | ||
func (o *StaticPodControllerOptions) ApplyTo(cfg *config.StaticPodControllerConfiguration) error { | ||
if o == nil { | ||
return nil | ||
} | ||
cfg.UpgradeWorkerImage = o.UpgradeWorkerImage | ||
return nil | ||
} | ||
|
||
// Validate checks validation of StaticPodControllerOptions. | ||
func (o *StaticPodControllerOptions) Validate() []error { | ||
if o == nil { | ||
return nil | ||
} | ||
errs := []error{} | ||
return errs | ||
} |
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
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.
the group of pod is "" instead of
core.openyurt.io
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.
done