Skip to content

*: add cluster-etcd-operator to CVO operator payload #53

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

Merged
openshift-merge-robot merged 2 commits into from
Jan 25, 2020
Merged

*: add cluster-etcd-operator to CVO operator payload #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64a0035
revert static controllers: use typed informer, start operatorinformer…
hexfusion Jan 15, 2020
8f7c7c0
*: add cluster-etcd-operator to CVO operator payload
hexfusion Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ COPY --from=builder /go/src/github.com/openshift/cluster-etcd-operator/bindata/b
COPY --from=builder /go/src/github.com/openshift/cluster-etcd-operator/cluster-etcd-operator /usr/bin/
COPY --from=builder /go/src/github.com/openshift/cluster-etcd-operator/manifests/ /manifests/

# LABEL io.openshift.release.operator true
LABEL io.openshift.release.operator true
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ COPY --from=builder /go/src/github.com/openshift/cluster-etcd-operator/bindata/b
COPY --from=builder /go/src/github.com/openshift/cluster-etcd-operator/cluster-etcd-operator /usr/bin/
COPY --from=builder /go/src/github.com/openshift/cluster-etcd-operator/manifests/ /manifests/

# LABEL io.openshift.release.operator true
LABEL io.openshift.release.operator true
2 changes: 1 addition & 1 deletion manifests/0000_12_etcd-operator_01_operator.cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
annotations:
release.openshift.io/create-only: "true"
spec:
managementState: Unmanaged
managementState: Managed
23 changes: 14 additions & 9 deletions pkg/cmd/staticsynccontroller/staticsynccontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ import (
"os"
"time"

"k8s.io/apimachinery/pkg/runtime/schema"

operatorv1 "github.com/openshift/api/operator/v1"
operatorversionedclient "github.com/openshift/client-go/operator/clientset/versioned"
etcdv1 "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1"
operatorv1informers "github.com/openshift/client-go/operator/informers/externalversions"
operatorinformers "github.com/openshift/client-go/operator/informers/externalversions/operator/v1"
"github.com/openshift/cluster-etcd-operator/pkg/operator/operatorclient"
"github.com/openshift/cluster-etcd-operator/pkg/version"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
)

const (
Expand Down Expand Up @@ -105,20 +107,24 @@ func (s *syncOpts) Run() error {

kubeInformerFactory := informers.NewFilteredSharedInformerFactory(clientset, 0, etcdNamespace, nil)

etcdInformer, err := operatorClient.Informers.ForResource(schema.GroupVersionResource{
Group: "operator.openshift.io",
Version: "v1",
Resource: "etcds",
})
if err != nil {
klog.Errorf("error getting etcd informer %#v", err)
return err
}

staticSyncController := NewStaticSyncController(
operatorClient.Client.Etcds(),
operatorConfigInformers.Operator().V1().Etcds(),
etcdInformer,
kubeInformerFactory,
eventRecorder,
)

kubeInformerFactory.Start(ctx.Done())
operatorConfigInformers.Start(ctx.Done())

go staticSyncController.Run(ctx.Done())

Expand All @@ -128,7 +134,7 @@ func (s *syncOpts) Run() error {

type StaticSyncController struct {
etcdKubeClient etcdv1.EtcdInterface
etcdInformer operatorinformers.EtcdInformer
etcdInformer informers.GenericInformer
secretInformer cache.SharedIndexInformer
kubeInformersForOpenshiftEtcdNamespace informers.SharedInformerFactory

Expand All @@ -139,7 +145,7 @@ type StaticSyncController struct {

func NewStaticSyncController(
etcdKubeClient etcdv1.EtcdInterface,
etcdInformer operatorinformers.EtcdInformer,
etcdInformer informers.GenericInformer,
kubeInformersForOpenshiftEtcdNamespace informers.SharedInformerFactory,
eventRecorder events.Recorder,
) *StaticSyncController {
Expand Down Expand Up @@ -217,7 +223,6 @@ func (c *StaticSyncController) Run(stopCh <-chan struct{}) {

if !cache.WaitForCacheSync(stopCh,
c.secretInformer.HasSynced,
c.etcdInformer.Informer().HasSynced,
) {
utilruntime.HandleError(fmt.Errorf("caches did not sync"))
return
Expand Down