-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
image: rewire imagetrigger controller initialization to use a control…
…ler init func
- Loading branch information
Showing
11 changed files
with
267 additions
and
250 deletions.
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
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,139 @@ | ||
| package controller | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| kv1core "k8s.io/client-go/kubernetes/typed/core/v1" | ||
| kapi "k8s.io/kubernetes/pkg/api" | ||
| kapiv1 "k8s.io/kubernetes/pkg/api/v1" | ||
| kappsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" | ||
| kextensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" | ||
| kclientsetexternal "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" | ||
|
|
||
| buildclient "github.com/openshift/origin/pkg/build/client" | ||
| oscache "github.com/openshift/origin/pkg/client/cache" | ||
| configapi "github.com/openshift/origin/pkg/cmd/server/api" | ||
| serverapi "github.com/openshift/origin/pkg/cmd/server/api" | ||
| "github.com/openshift/origin/pkg/cmd/server/bootstrappolicy" | ||
| imagetriggercontroller "github.com/openshift/origin/pkg/image/controller/trigger" | ||
| triggerannotations "github.com/openshift/origin/pkg/image/trigger/annotations" | ||
| triggerbuildconfigs "github.com/openshift/origin/pkg/image/trigger/buildconfigs" | ||
| triggerdeploymentconfigs "github.com/openshift/origin/pkg/image/trigger/deploymentconfigs" | ||
| ) | ||
|
|
||
| type ImageTriggerControllerConfig struct { | ||
| DisabledFeatures serverapi.FeatureList | ||
| } | ||
|
|
||
| func (c *ImageTriggerControllerConfig) RunController(ctx ControllerContext) (bool, error) { | ||
| streamInformer := ctx.DeprecatedOpenshiftInformers.ImageStreams().Informer() | ||
| lister := temporaryLister{ctx.DeprecatedOpenshiftInformers.ImageStreams().Lister()} | ||
|
|
||
| oclient, err := ctx.ClientBuilder.DeprecatedOpenshiftClient(bootstrappolicy.InfraImageTriggerControllerServiceAccountName) | ||
| if err != nil { | ||
| return true, err | ||
| } | ||
| kclient := ctx.ClientBuilder.ClientOrDie(bootstrappolicy.InfraImageTriggerControllerServiceAccountName) | ||
|
|
||
| updater := podSpecUpdater{kclient} | ||
| bcInstantiator := buildclient.NewOSClientBuildConfigInstantiatorClient(oclient) | ||
| broadcaster := imagetriggercontroller.NewTriggerEventBroadcaster(kv1core.New(kclient.CoreV1().RESTClient())) | ||
|
|
||
| sources := []imagetriggercontroller.TriggerSource{ | ||
| { | ||
| Resource: schema.GroupResource{Group: "apps.openshift.io", Resource: "deploymentconfigs"}, | ||
| Informer: ctx.DeprecatedOpenshiftInformers.DeploymentConfigs().Informer(), | ||
| Store: ctx.DeprecatedOpenshiftInformers.DeploymentConfigs().Indexer(), | ||
| TriggerFn: triggerdeploymentconfigs.NewDeploymentConfigTriggerIndexer, | ||
| Reactor: &triggerdeploymentconfigs.DeploymentConfigReactor{Client: oclient}, | ||
| }, | ||
| } | ||
| if !c.DisabledFeatures.Has(configapi.FeatureBuilder) { | ||
| sources = append(sources, imagetriggercontroller.TriggerSource{ | ||
| Resource: schema.GroupResource{Group: "build.openshift.io", Resource: "buildconfigs"}, | ||
| Informer: ctx.DeprecatedOpenshiftInformers.BuildConfigs().Informer(), | ||
| Store: ctx.DeprecatedOpenshiftInformers.BuildConfigs().Indexer(), | ||
| TriggerFn: triggerbuildconfigs.NewBuildConfigTriggerIndexer, | ||
| Reactor: &triggerbuildconfigs.BuildConfigReactor{Instantiator: bcInstantiator}, | ||
| }) | ||
| } | ||
| if !c.DisabledFeatures.Has("triggers.image.openshift.io/deployments") { | ||
| sources = append(sources, imagetriggercontroller.TriggerSource{ | ||
| Resource: schema.GroupResource{Group: "extensions", Resource: "deployments"}, | ||
| Informer: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Apps().V1beta1().Deployments().Informer(), | ||
| Store: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Apps().V1beta1().Deployments().Informer().GetIndexer(), | ||
| TriggerFn: triggerannotations.NewAnnotationTriggerIndexer, | ||
| Reactor: &triggerannotations.AnnotationReactor{Updater: updater, Copier: kapi.Scheme}, | ||
| }) | ||
| } | ||
| if !c.DisabledFeatures.Has("triggers.image.openshift.io/daemonsets") { | ||
| sources = append(sources, imagetriggercontroller.TriggerSource{ | ||
| Resource: schema.GroupResource{Group: "extensions", Resource: "daemonsets"}, | ||
| Informer: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Extensions().V1beta1().DaemonSets().Informer(), | ||
| Store: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Extensions().V1beta1().DaemonSets().Informer().GetIndexer(), | ||
| TriggerFn: triggerannotations.NewAnnotationTriggerIndexer, | ||
| Reactor: &triggerannotations.AnnotationReactor{Updater: updater, Copier: kapi.Scheme}, | ||
| }) | ||
| } | ||
| if !c.DisabledFeatures.Has("triggers.image.openshift.io/statefulsets") { | ||
| sources = append(sources, imagetriggercontroller.TriggerSource{ | ||
| Resource: schema.GroupResource{Group: "apps", Resource: "statefulsets"}, | ||
| Informer: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Apps().V1beta1().StatefulSets().Informer(), | ||
| Store: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Apps().V1beta1().StatefulSets().Informer().GetIndexer(), | ||
| TriggerFn: triggerannotations.NewAnnotationTriggerIndexer, | ||
| Reactor: &triggerannotations.AnnotationReactor{Updater: updater, Copier: kapi.Scheme}, | ||
| }) | ||
| } | ||
| if !c.DisabledFeatures.Has("triggers.image.openshift.io/cronjobs") { | ||
| sources = append(sources, imagetriggercontroller.TriggerSource{ | ||
| Resource: schema.GroupResource{Group: "batch", Resource: "cronjobs"}, | ||
| Informer: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Batch().V2alpha1().CronJobs().Informer(), | ||
| Store: ctx.DeprecatedOpenshiftInformers.KubernetesInformers().Batch().V2alpha1().CronJobs().Informer().GetIndexer(), | ||
| TriggerFn: triggerannotations.NewAnnotationTriggerIndexer, | ||
| Reactor: &triggerannotations.AnnotationReactor{Updater: updater, Copier: kapi.Scheme}, | ||
| }) | ||
| } | ||
|
|
||
| go imagetriggercontroller.NewTriggerController( | ||
| broadcaster, | ||
| streamInformer, | ||
| lister, | ||
| sources..., | ||
| ).Run(5, ctx.Stop) | ||
|
|
||
| return true, nil | ||
| } | ||
|
|
||
| // TODO: remove when generated informers exist | ||
| type temporaryLister struct { | ||
| *oscache.StoreToImageStreamLister | ||
| } | ||
|
|
||
| func (l temporaryLister) ImageStreams(namespace string) imagetriggercontroller.ImageStreamNamespaceLister { | ||
| return l.StoreToImageStreamLister.ImageStreams(namespace) | ||
| } | ||
|
|
||
| type podSpecUpdater struct { | ||
| kclient kclientsetexternal.Interface | ||
| } | ||
|
|
||
| func (u podSpecUpdater) Update(obj runtime.Object) error { | ||
| switch t := obj.(type) { | ||
| case *kextensionsv1beta1.DaemonSet: | ||
| _, err := u.kclient.Extensions().DaemonSets(t.Namespace).Update(t) | ||
| return err | ||
| case *kappsv1beta1.Deployment: | ||
| _, err := u.kclient.Apps().Deployments(t.Namespace).Update(t) | ||
| return err | ||
| case *kappsv1beta1.StatefulSet: | ||
| _, err := u.kclient.Apps().StatefulSets(t.Namespace).Update(t) | ||
| return err | ||
| case *kapiv1.Pod: | ||
| _, err := u.kclient.Core().Pods(t.Namespace).Update(t) | ||
| return err | ||
| default: | ||
| return fmt.Errorf("unrecognized object - no trigger update possible for %T", obj) | ||
| } | ||
| } |
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.