Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add two feature gates : Image based deployment and additional runtimeClasses #394

Closed
wants to merge 16 commits into from
Closed

Add two feature gates : Image based deployment and additional runtimeClasses #394

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
27a7e94
Move featuregates to separate package
bpradipt Apr 23, 2024
b6bacc1
Add method to check for feature cm
bpradipt Apr 25, 2024
2559ba0
Add support for layered image based deployment
bpradipt Apr 23, 2024
c4de12f
Add separate event handler for configmap updates
bpradipt Apr 8, 2024
c69ccba
Allow multiple runtimeClass creation
bpradipt Apr 6, 2024
1fc86ae
Add feature for creating additional runtimeClasses
bpradipt Apr 6, 2024
36272dc
Update featuregate sample yaml
bpradipt Apr 23, 2024
d1eea4b
remove unused method
bpradipt Apr 24, 2024
fb547fe
Rename DefaultFeatureGates to DefaultFeatureGatesStatus
bpradipt Apr 25, 2024
0e53603
Handle featuregate cm delete
bpradipt Apr 24, 2024
6c004fd
Create featuregate status configmap at start
bpradipt Apr 25, 2024
9e96e8d
Handle missing featuregate status configmap
bpradipt Apr 25, 2024
c59f99b
Remove duplicate code for reading yamls
bpradipt Apr 25, 2024
27599db
Rename FeatureGatesConfigMapName to FeatureGatesStatusConfigMapName
bpradipt Apr 25, 2024
9a30d74
Revert fg status configmap to default on KataConfig deletion
bpradipt Apr 25, 2024
5f47dc5
Add unit tests for fg method
bpradipt Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions controllers/openshift_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ func (r *KataConfigOpenShiftReconciler) Reconcile(ctx context.Context, req ctrl.
// Check for enabled FeatureGates by retrieving the FeatureGateStatus
r.FeatureGatesStatus = r.FeatureGates.GetFeatureGateStatus(ctx)

// If FeatureGateStatus is nil, we cannot proceed. Log the error and reconcile
// This ensures we don't take any action if we cannot determine the FeatureGateStatus
// Which could be due to an error in fetching the ConfigMap or the ConfigMap not being present
if r.FeatureGatesStatus == nil {
r.Log.Info("FeatureGateStatus is nil, cannot proceed. Check if the feature gate configmap is present")
return ctrl.Result{}, nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was discussed elsewhere so here just briefly for public record: I believe that just continuing here as if a default-valued feature gate configmap was present would lead to both simpler implementation and better user experience.

}

return func() (ctrl.Result, error) {

// k8s resource correctness checking on creation/modification
Expand Down