Skip to content

Observe publicHostname from top level console config #50

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 4 commits into from
Jan 30, 2019
Merged

Observe publicHostname from top level console config #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3482dec
Bump glide.yaml to 1.12.5
enj Jan 30, 2019
bc735c1
bump(*)
enj Jan 30, 2019
091d91f
no-op compile fixes related to bump
enj Jan 30, 2019
52c7360
Observe publicHostname from top level console config
enj Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
84 changes: 61 additions & 23 deletions glide.lock
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package: github.com/openshift/cluster-authentication-operator
import:
- package: k8s.io/apimachinery
version: kubernetes-1.11.1
version: kubernetes-1.12.5
- package: k8s.io/api
version: kubernetes-1.11.1
version: kubernetes-1.12.5
- package: k8s.io/apiserver
version: kubernetes-1.11.1
version: kubernetes-1.12.5
- package: k8s.io/client-go
version: kubernetes-1.11.1
version: kubernetes-1.12.5
- package: k8s.io/kube-aggregator
version: kubernetes-1.11.1
version: kubernetes-1.12.5
- package: k8s.io/apiextensions-apiserver
version: kubernetes-1.11.1
version: kubernetes-1.12.5
- package: k8s.io/code-generator
version: kubernetes-1.11.1
version: kubernetes-1.12.5
- package: github.com/openshift/api
version: master
- package: github.com/openshift/client-go
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@ func (c osinOperator) Sync(obj metav1.Object) error {
if err := out.UnmarshalJSON(mergedBytes); err != nil {
return err
}
_, updateErr := c.kubeAPIServerOperatorConfig.Update(out)
_, updateErr := c.kubeAPIServerOperatorConfig.Update(out, metav1.UpdateOptions{})
return updateErr
}
8 changes: 4 additions & 4 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
kubeAPIServerOperatorConfig,
)

kubeInformersNamespaced.Start(ctx.StopCh)
go kubeAPIServerOperatorConfigInformer.Informer().Run(ctx.StopCh)
kubeInformersNamespaced.Start(ctx.Context.Done())
go kubeAPIServerOperatorConfigInformer.Informer().Run(ctx.Context.Done())

go operator.Run(ctx.StopCh)
go operator.Run(ctx.Context.Done())

<-ctx.StopCh
<-ctx.Context.Done()

return fmt.Errorf("stopped")
}
Expand Down
Loading