Skip to content

Commit

Permalink
Merge pull request #3791 from yowenter/feature/NGINXController_remove…
Browse files Browse the repository at this point in the history
…_annoations

- remove annotations in nginxcontroller struct
  • Loading branch information
k8s-ci-robot authored Feb 21, 2019
2 parents 7534cd5 + 24993f3 commit 4ae7fe5
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions internal/ingress/controller/nginx.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import (

"k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
"k8s.io/ingress-nginx/internal/ingress/controller/process"
Expand Down Expand Up @@ -133,9 +132,6 @@ func NewNGINXController(config *Configuration, mc metric.Collector, fs file.File
config.DisableCatchAll)

n.syncQueue = task.NewTaskQueue(n.syncIngress)

n.annotations = annotations.NewAnnotationExtractor(n.store)

if config.UpdateStatus {
n.syncStatus = status.NewStatusSyncer(status.Config{
Client: config.Client,
Expand Down Expand Up @@ -221,8 +217,6 @@ Error loading new template: %v
type NGINXController struct {
cfg *Configuration

annotations annotations.Extractor

recorder record.EventRecorder

syncQueue *task.Queue
Expand Down

0 comments on commit 4ae7fe5

Please sign in to comment.