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

Record events against TPR #290

Merged
merged 5 commits into from Jul 17, 2017
Merged
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
4 changes: 2 additions & 2 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/certificate/controller.go
Expand Up @@ -16,13 +16,15 @@ import (
acs "github.com/appscode/voyager/client/clientset"
"github.com/appscode/voyager/pkg/certificate/providers"
"github.com/appscode/voyager/pkg/config"
"github.com/appscode/voyager/pkg/eventer"
"github.com/xenolf/lego/acme"
kerr "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
clientset "k8s.io/client-go/kubernetes"
apiv1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/tools/record"
)

const (
Expand All @@ -42,6 +44,7 @@ type Controller struct {
KubeClient clientset.Interface
ExtClient acs.ExtensionInterface
Opt config.Options
recorder record.EventRecorder

tpr *api.Certificate
acmeCert ACMECertData
Expand All @@ -60,6 +63,7 @@ func NewController(kubeClient clientset.Interface, extClient acs.ExtensionInterf
ExtClient: extClient,
Opt: opt,
tpr: tpr,
recorder: eventer.NewEventRecorder(kubeClient, "Voyager operator"),
}
}

Expand Down
2 changes: 2 additions & 0 deletions pkg/ingress/parser.go
Expand Up @@ -15,6 +15,7 @@ import (
_ "github.com/appscode/voyager/api/install"
acs "github.com/appscode/voyager/client/clientset"
"github.com/appscode/voyager/pkg/config"
"github.com/appscode/voyager/pkg/eventer"
"github.com/appscode/voyager/pkg/ingress/template"
"github.com/appscode/voyager/third_party/forked/cloudprovider"
_ "github.com/appscode/voyager/third_party/forked/cloudprovider/providers"
Expand All @@ -39,6 +40,7 @@ func NewController(
PromClient: promClient,
Opt: opt,
Ingress: ingress,
recorder: eventer.NewEventRecorder(kubeClient, "Voyager operator"),
}
log.Infoln("Initializing cloud manager for provider", opt.CloudProvider)
if opt.CloudProvider == "aws" || opt.CloudProvider == "gce" || opt.CloudProvider == "azure" {
Expand Down
2 changes: 2 additions & 0 deletions pkg/ingress/types.go
Expand Up @@ -9,12 +9,14 @@ import (
"github.com/appscode/voyager/third_party/forked/cloudprovider"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/record"
)

type Controller struct {
KubeClient clientset.Interface
ExtClient acs.ExtensionInterface
PromClient pcm.MonitoringV1alpha1Interface
recorder record.EventRecorder

Opt config.Options

Expand Down
12 changes: 6 additions & 6 deletions pkg/ingress/update.go
Expand Up @@ -22,7 +22,7 @@ const (
UpdateStats // Update things for stats update
)

func (lbc *Controller) Update(t UpdateMode) error {
func (lbc *Controller) Update(mode UpdateMode) error {
err := lbc.generateTemplate()
if err != nil {
return errors.FromErr(err).Err()
Expand All @@ -33,15 +33,15 @@ func (lbc *Controller) Update(t UpdateMode) error {
return errors.FromErr(err).Err()
}

if t&UpdateFirewall > 0 ||
t&RestartHAProxy > 0 ||
t&UpdateStats > 0 {
if mode&UpdateFirewall > 0 ||
mode&RestartHAProxy > 0 ||
mode&UpdateStats > 0 {
err := lbc.recreatePods()
if err != nil {
return errors.FromErr(err).Err()
}
}
if t&UpdateFirewall > 0 {
if mode&UpdateFirewall > 0 {
err := lbc.updateLBSvc()
if err != nil {
// Only update if the service is updated.
Expand All @@ -50,7 +50,7 @@ func (lbc *Controller) Update(t UpdateMode) error {
return err
}

if t&UpdateStats > 0 {
if mode&UpdateStats > 0 {
if lbc.Parsed.Stats {
lbc.ensureStatsService()
} else {
Expand Down
7 changes: 5 additions & 2 deletions vendor/gopkg.in/yaml.v2/decode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion vendor/gopkg.in/yaml.v2/yaml.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.