remove disabledfeatures from master config #19070
Conversation
openshift-ci-robot
added
sig/master
approved
openshift-ci-robot
added
the
size/XL
| sources = append(sources, imagetriggercontroller.TriggerSource{ | ||
| Resource: schema.GroupResource{Group: "apps", Resource: "statefulsets"}, | ||
| Informer: ctx.ExternalKubeInformers.Apps().V1beta1().StatefulSets().Informer(), | ||
| Store: ctx.ExternalKubeInformers.Apps().V1beta1().StatefulSets().Informer().GetIndexer(), |
There was a problem hiding this comment.
While you're at it can you update all these to use the Apps().V1() for all of the above 3 (deployments, daemonsets and statefulsets).
There was a problem hiding this comment.
While you're at it can you update all these to use the Apps().V1() for all of the above 3 (deployments, daemonsets and statefulsets).
Doesn't that ripple through the types in the controller too? I'd have to update all the trigger funcs, rigth?
There was a problem hiding this comment.
Ok, I'll create a followup.
| sources = append(sources, imagetriggercontroller.TriggerSource{ | ||
| Resource: schema.GroupResource{Group: "batch", Resource: "cronjobs"}, | ||
| Informer: ctx.ExternalKubeInformers.Batch().V2alpha1().CronJobs().Informer(), | ||
| Store: ctx.ExternalKubeInformers.Batch().V2alpha1().CronJobs().Informer().GetIndexer(), |
There was a problem hiding this comment.
Same here, but Batch().V1beta1().
| Reactor: &triggerannotations.AnnotationReactor{Updater: updater}, | ||
| }) | ||
| } | ||
| sources = append(sources, imagetriggercontroller.TriggerSource{ |
There was a problem hiding this comment.
I'm slightly worried we're enabling this, iirc this was explicitly disabled due to some problems. @tnozicka or @mfojtik mind remember some details.
It would have failed validation here, right? https://github.com/openshift/origin/pull/19070/files#diff-6b6e279f3c86e5edb0688c1ca449db56L241
| @@ -102,8 +102,6 @@ type OpenshiftAPIExtraConfig struct { | |||
| ProjectRequestTemplate string | |||
| ProjectRequestMessage string | |||
|
|
|||
| EnableBuilds bool | |||
deads2k
force-pushed
the
server-08-features-on
branch
from
a3dd7a4 to
a879b18
Compare
deads2k
force-pushed
the
server-08-features-on
branch
from
a879b18 to
f14a3a5
Compare
|
/retest |
1 similar comment
|
/retest |
| @@ -63,51 +54,41 @@ func (c *ImageTriggerControllerConfig) RunController(ctx ControllerContext) (boo | |||
| Reactor: &triggerdeploymentconfigs.DeploymentConfigReactor{Client: appsClient.Apps()}, | |||
| }, | |||
| } | |||
| if !c.HasBuilderEnabled { | |||
There was a problem hiding this comment.
@deads2k was this even logically correct before? if has not builder enabled, then add trigger for build configs sounds weird to me?
There was a problem hiding this comment.
i guess not :-) and nobody noticed this since 3.6... shame on me and shame on @smarterclayton who manually merged it ;-)
There was a problem hiding this comment.
nvmd. false alarm, this code is unfortunate but it works because we check if the feature is disabled when we initialize this struct (the negation should have been there to make this more clear...)
| @@ -228,9 +228,6 @@ type MasterConfig struct { | |||
| // ControllerConfig holds configuration values for controllers | |||
| ControllerConfig ControllerConfig `json:"controllerConfig"` | |||
|
|
|||
| // DisabledFeatures is a list of features that should not be started. | |||
| DisabledFeatures FeatureList `json:"disabledFeatures"` | |||
There was a problem hiding this comment.
can we give users a deprecation warning here and ignore that option? Might help migration if somebody used this before.
There was a problem hiding this comment.
It never even worked, so I don't think it makes any sense. I wonder if we have any docs about it at all.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k, soltysh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test all [submit-queue is verifying that this PR is safe to merge] |
|
Automatic merge from submit-queue. |
FeatureBuilderwas agreed to remove by @smarterclayton and @eparis .FeatureS2Iwas not usedFeatureWebConsoledoesn't make sense the webconsole isn't include here. Just don't install it. Also, it didn't control the exposure of the consoleopenshift.io/resourceused by image builder. Don't know when this was added, but it never passed validation here:ValidateDisabledFeatures@openshift/api-review
@openshift/sig-master
/assign @mfojtik
/assign @soltysh