Skip to content

Bug 1912945: Set proxy config in Deployment containers #106

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 1 commit into from
Jan 14, 2021
Merged

Bug 1912945: Set proxy config in Deployment containers #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions assets/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ apiVersion: apps/v1
metadata:
name: aws-ebs-csi-driver-controller
namespace: openshift-cluster-csi-drivers
annotations:
config.openshift.io/inject-proxy: csi-driver
spec:
selector:
matchLabels:
Expand Down
2 changes: 2 additions & 0 deletions assets/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ apiVersion: apps/v1
metadata:
name: aws-ebs-csi-driver-node
namespace: openshift-cluster-csi-drivers
annotations:
config.openshift.io/inject-proxy: csi-driver
spec:
selector:
matchLabels:
Expand Down
4 changes: 4 additions & 0 deletions pkg/generated/bindata.go
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/openshift/library-go/pkg/controller/controllercmd"
"github.com/openshift/library-go/pkg/operator/csi/csicontrollerset"
"github.com/openshift/library-go/pkg/operator/csi/csidrivercontrollerservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
goc "github.com/openshift/library-go/pkg/operator/genericoperatorclient"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
"github.com/openshift/library-go/pkg/operator/v1helpers"
Expand Down Expand Up @@ -86,6 +87,9 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
"rbac/snapshotter_role.yaml",
"rbac/snapshotter_binding.yaml",
},
).WithCSIConfigObserverController(
"AWSEBSDriverCSIConfigObserverController",
configInformers,
).WithCSIDriverControllerService(
"AWSEBSDriverControllerServiceController",
withCustomCABundle(generated.MustAsset, kubeClient),
Expand All @@ -94,12 +98,14 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
kubeInformersForNamespaces.InformersFor(defaultNamespace),
configInformers,
csidrivercontrollerservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, secretName, secretInformer),
csidrivercontrollerservicecontroller.WithObservedProxyDeploymentHook(),
).WithCSIDriverNodeService(
"AWSEBSDriverNodeServiceController",
generated.MustAsset,
"node.yaml",
kubeClient,
kubeInformersForNamespaces.InformersFor(defaultNamespace),
csidrivernodeservicecontroller.WithObservedProxyDaemonSetHook(),
).WithExtraInformers(secretInformer.Informer())

if err != nil {
Expand Down
4 changes: 4 additions & 0 deletions pkg/operator/starter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ apiVersion: apps/v1
metadata:
name: aws-ebs-csi-driver-controller
namespace: openshift-cluster-csi-drivers
annotations:
config.openshift.io/inject-proxy: csi-driver
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -181,6 +183,8 @@ apiVersion: apps/v1
metadata:
name: aws-ebs-csi-driver-controller
namespace: openshift-cluster-csi-drivers
annotations:
config.openshift.io/inject-proxy: csi-driver
spec:
selector:
matchLabels:
Expand Down