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.

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

Jump to bottom

Record events against TPR #290

Merged
merged 5 commits into from
Jul 17, 2017
Merged

Record events against TPR #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c6c4ba
Record events against TPR
tamalsaha Jul 12, 2017
7b99fd3
Merge master
sadlil Jul 17, 2017
74d7f3b
Add Comments
sadlil Jul 17, 2017
e14a3d0
Return error if serviceMonitor Add failes.
sadlil Jul 17, 2017
a9a4bad
Fix event Reason Strings
sadlil Jul 17, 2017
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
5 changes: 4 additions & 1 deletion glide.lock
View file
Open in desktop

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

58 changes: 55 additions & 3 deletions pkg/certificate/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
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 Expand Up @@ -145,17 +149,65 @@ func (c *Controller) Process() error {
}
if !c.crt.NotAfter.After(time.Now().Add(time.Hour * 24 * 7)) {
log.Infoln("certificate is expiring in 7 days, attempting renew")
c.renew()
err := c.renew()
if err != nil {
c.recorder.Eventf(
c.tpr,
apiv1.EventTypeWarning,
eventer.EventReasonCertificateRenewFailed,
"Failed to renew certificate, Reason %s",
err.Error(),
)
return err
}
c.recorder.Eventf(
c.tpr,
apiv1.EventTypeWarning,
eventer.EventReasonCertificateRenewSuccessful,
"Successfully renewed certificate",
)
}

if !c.acmeCert.EqualDomains(c.crt) {
c.renew()
err := c.renew()
if err != nil {
c.recorder.Eventf(
c.tpr,
apiv1.EventTypeWarning,
eventer.EventReasonCertificateRenewFailed,
"Failed to renew certificate, Reason %s",
err.Error(),
)
return err
}
c.recorder.Eventf(
c.tpr,
apiv1.EventTypeWarning,
eventer.EventReasonCertificateRenewSuccessful,
"Successfully renewed certificate",
)
}
}

if kerr.IsNotFound(err) || !c.tpr.Status.CertificateObtained {
// Certificate Not found as secret. We must create it now.
c.create()
err := c.create()
if err != nil {
c.recorder.Eventf(
c.tpr,
apiv1.EventTypeWarning,
eventer.EventReasonCertificateCreateFailed,
"Failed to create certificate, Reason: %s",
err.Error(),
)
return err
}
c.recorder.Eventf(
c.tpr,
apiv1.EventTypeWarning,
eventer.EventReasonCertificateCreateSuccessful,
"Successfully created certificate",
)
}
return nil
}
Expand Down
27 changes: 20 additions & 7 deletions pkg/eventer/recorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,26 @@ import (
)

const (
//EventReasonInvalidCronExpression = "InvalidCronExpression"
//EventReasonSuccessfulCronExpressionReset = "SuccessfulCronExpressionReset"
//EventReasonSuccessfulBackup = "SuccessfulBackup"
//EventReasonFailedToBackup = "FailedBackup"
//EventReasonFailedToRetention = "FailedRetention"
//EventReasonFailedToUpdate = "FailedUpdateBackup"
//EventReasonFailedCronJob = "FailedCronJob"
// Certificate Events
EventReasonCertificateRenewFailed = "RenewFailed"
EventReasonCertificateRenewSuccessful = "RenewSuccessful"
EventReasonCertificateCreateFailed = "CreateFailed"
EventReasonCertificateCreateSuccessful = "CreateSuccessful"

// Ingress Events
EventReasonIngressConfigMapCreateFailed = "ConfigMapCreateFailed"
EventReasonIngressConfigMapCreateSuccessful = "ConfigMapCreateSuccessful"
EventReasonIngressUnsupportedLBType = "UnsupportedLBType"
EventReasonIngressControllerCreateFailed = "ControllerCreateFailed"
EventReasonIngressControllerCreateSuccessful = "ControllerCreateSuccessful"
EventReasonIngressServiceCreateFailed = "ServiceCreateFailed"
EventReasonIngressServiceCreateSuccessful = "ServiceCreateSuccessful"
EventReasonIngressServiceMonitorCreateFailed = "ServiceMonitorCreateFailed"
EventReasonIngressServiceMonitorCreateSuccessful = "ServiceMonitorCreateSuccessful"
EventReasonIngressUpdateFailed = "UpdateFailed"
EventReasonIngressUpdateSuccessful = "UpdateSuccessful"
EventReasonIngressServiceUpdateFailed = "ServiceUpdateFailed"
EventReasonIngressServiceUpdateSuccessful = "ServiceUpdateSuccessful"
)

func NewEventRecorder(client clientset.Interface, component string) record.EventRecorder {
Expand Down
138 changes: 130 additions & 8 deletions pkg/ingress/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/appscode/go/types"
"github.com/appscode/log"
"github.com/appscode/voyager/api"
"github.com/appscode/voyager/pkg/eventer"
"github.com/appscode/voyager/pkg/monitor"
kerr "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -32,8 +33,23 @@ func (lbc *Controller) Create() error {

err = lbc.ensureConfigMap()
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressConfigMapCreateFailed,
"Reason: %s",
err.Error(),
)
return errors.FromErr(err).Err()
}
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressConfigMapCreateSuccessful,
"Successfully created ConfigMap %s",
lbc.Ingress.OffshootName(),
)

time.Sleep(time.Second * 5)
err = lbc.createLB()
if err != nil {
Expand Down Expand Up @@ -85,49 +101,138 @@ func (lbc *Controller) ensureConfigMap() error {

if needsUpdate {
_, err = lbc.KubeClient.CoreV1().ConfigMaps(lbc.Ingress.Namespace).Update(cm)
return err
return errors.FromErr(err).Err()
}
return nil
}

func (lbc *Controller) createLB() error {
if !lbc.SupportsLBType() {
return errors.Newf("LBType %s is unsupported for cloud provider: %s", lbc.Ingress.LBType(), lbc.Opt.CloudProvider).Err()
err := errors.Newf("LBType %s is unsupported for cloud provider: %s", lbc.Ingress.LBType(), lbc.Opt.CloudProvider).Err()
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressUnsupportedLBType,
err.Error(),
)
return err
}

// Specifically Add Controller and Service Event Separately for all LBTypes.
if lbc.Ingress.LBType() == api.LBTypeHostPort {
err := lbc.createHostPortPods()
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressControllerCreateFailed,
"Failed to create HostPortPods, Reason: %s",
err.Error(),
)
return errors.FromErr(err).Err()
}
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressControllerCreateSuccessful,
"Successfully created HostPortPods",
)

time.Sleep(time.Second * 10)
err = lbc.createHostPortSvc()
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressServiceCreateFailed,
"Failed to create HostPortService, Reason: %s",
err.Error(),
)
return errors.FromErr(err).Err()
}
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressServiceCreateSuccessful,
"Successfully created HostPortService",
)
} else if lbc.Ingress.LBType() == api.LBTypeNodePort {
err := lbc.createNodePortPods()
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressControllerCreateFailed,
"Failed to create NodePortPods, Reason: %s",
err.Error(),
)
return errors.FromErr(err).Err()
}
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressControllerCreateSuccessful,
"Successfully created NodePortPods")

time.Sleep(time.Second * 10)
err = lbc.createNodePortSvc()
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressServiceCreateFailed,
"Failed to create NodePortService, Reason: %s",
err.Error(),
)
return errors.FromErr(err).Err()
}
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressServiceCreateSuccessful,
"Successfully created NodePortService",
)
} else {
// deleteResidualPods is a safety checking deletion of previous version RC
// This should Ignore error.
lbc.deleteResidualPods()
err := lbc.createNodePortPods()
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressControllerCreateFailed,
"Failed to create NodePortPods, Reason: %s",
err.Error(),
)
return errors.FromErr(err).Err()
}
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressControllerCreateSuccessful,
"Successfully created NodePortPods",
)

time.Sleep(time.Second * 10)
err = lbc.createLoadBalancerSvc()
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressServiceCreateFailed,
"Failed to create LoadBalancerService, Reason: %s",
err.Error(),
)
return errors.FromErr(err).Err()
}
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressServiceCreateSuccessful,
"Successfully created LoadBalancerService",
)

go lbc.updateStatus()
}

Expand All @@ -137,7 +242,23 @@ func (lbc *Controller) createLB() error {
}
if monSpec != nil && monSpec.Prometheus != nil {
ctrl := monitor.NewPrometheusController(lbc.KubeClient, lbc.PromClient)
ctrl.AddMonitor(lbc.Ingress, monSpec)
err := ctrl.AddMonitor(lbc.Ingress, monSpec)
// Error Ignored intentionally
if err != nil {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeWarning,
eventer.EventReasonIngressServiceMonitorCreateFailed,
err.Error(),
)
} else {
lbc.recorder.Eventf(
lbc.Ingress,
apiv1.EventTypeNormal,
eventer.EventReasonIngressServiceMonitorCreateSuccessful,
"Successfully created ServiceMonitor",
)
}
}
return nil
}
Expand Down Expand Up @@ -677,7 +798,7 @@ func (lbc *Controller) getExporterSidecar() (*apiv1.Container, error) {
return nil, nil
}

func (lbc *Controller) ensureStatsService() {
func (lbc *Controller) ensureStatsService() error {
svc := &apiv1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: lbc.Ingress.StatsServiceName(),
Expand Down Expand Up @@ -714,20 +835,21 @@ func (lbc *Controller) ensureStatsService() {
if kerr.IsNotFound(err) {
_, err := lbc.KubeClient.CoreV1().Services(lbc.Ingress.Namespace).Create(svc)
if err != nil {
log.Errorln("Failed to create Stats Service", err)
return errors.FromErr(err).Err()
}
return
return err
} else if err != nil {
log.Errorln(err)
return
return errors.FromErr(err).Err()
}
s.Labels = svc.Labels
s.Annotations = svc.Annotations
s.Spec = svc.Spec
_, err = lbc.KubeClient.CoreV1().Services(s.Namespace).Update(s)
if err != nil {
log.Errorln("Failed to update Stats Service", err)
return errors.FromErr(err).Err()
}
return nil
}

func (lbc *Controller) updateStatus() error {
Expand Down