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.

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 two feature gates : Image based deployment and additional runtimeClasses #394

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
12 changes: 6 additions & 6 deletions internal/featuregates/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import "strings"
*/

const (
FeatureGatesConfigMapName = "osc-feature-gates"
LayeredImageDeployment = "LayeredImageDeployment"
LayeredImageDeploymentConfig = "layeredimagedeployment-config"
AdditionalRuntimeClasses = "AdditionalRuntimeClasses"
AdditionalRuntimeClassesConfig = "additionalruntimeclasses-config"
FeatureGatesStatusConfigMapName = "osc-feature-gates"
Copy link
Contributor

Choose a reason for hiding this comment

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

Again, a good change but should be squashed with the commit where the original name was first introduced.

LayeredImageDeployment = "LayeredImageDeployment"
LayeredImageDeploymentConfig = "layeredimagedeployment-config"
AdditionalRuntimeClasses = "AdditionalRuntimeClasses"
AdditionalRuntimeClassesConfig = "additionalruntimeclasses-config"
)
bpradipt marked this conversation as resolved.
Show resolved Hide resolved

// Sample ConfigMap with Features
bpradipt marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -66,7 +66,7 @@ func GetFeatureGateConfigMapName(feature string) string {
// and do the match
func IsFeatureGateConfigMap(configMapName string) bool {
switch configMapName {
case FeatureGatesConfigMapName, LayeredImageDeploymentConfig, AdditionalRuntimeClassesConfig:
case FeatureGatesStatusConfigMapName, LayeredImageDeploymentConfig, AdditionalRuntimeClassesConfig:
return true
default:
return false
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func main() {
FeatureGates: &featuregates.FeatureGates{
Client: mgr.GetClient(),
Namespace: OperatorNamespace,
ConfigMapName: featuregates.FeatureGatesConfigMapName,
ConfigMapName: featuregates.FeatureGatesStatusConfigMapName,
},
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create KataConfig controller for OpenShift cluster", "controller", "KataConfig")
Expand Down