Skip to content

OCPBUGS-13895: [WRKLDS-730] route-controller-manager deployment updates #288

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
May 22, 2023
Merged

OCPBUGS-13895: [WRKLDS-730] route-controller-manager deployment updates #288

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
217e9dc
add POD_NAME to route-controller-manager deployment
atiratree May 8, 2023
b23ed82
introduce route-controller-defaultconfig and fix leader election
atiratree May 8, 2023
f682f18
rename defaultconfig to openshift-controller-manager-defaultconfig
atiratree May 15, 2023
1396e95
use route-controller-manager naming consistently
atiratree May 15, 2023
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
0 bindata/v3.11.0/config/defaultconfig.yaml → ...ift-controller-manager-defaultconfig.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions bindata/v3.11.0/config/route-controller-manager-defaultconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: openshiftcontrolplane.config.openshift.io/v1
kind: OpenShiftControllerManagerConfig
leaderElection:
name: openshift-route-controllers
11 changes: 11 additions & 0 deletions ...oute-controller-informer-clusterrole.yaml → ...route-controller-manager-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ClusterRole
metadata:
name: system:openshift:openshift-route-controller-manager
rules:
# informers
- apiGroups:
- ""
resources:
Expand All @@ -29,6 +30,7 @@ rules:
- get
- list
- watch
# emitting events
- apiGroups:
- ""
- events.k8s.io
Expand All @@ -38,3 +40,12 @@ rules:
- create
- patch
- update
# used for detection of HA to configure leader election
- apiGroups:
- config.openshift.io
resources:
- infrastructures
verbs:
- get
- list
- watch
0 ...ntroller-informer-clusterrolebinding.yaml → ...ontroller-manager-clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...ntroller-manager/route-controller-cm.yaml → ...-manager/route-controller-manager-cm.yaml
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions ...ller-manager/route-controller-deploy.yaml → ...ager/route-controller-manager-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ spec:
ports:
- containerPort: 8443
terminationMessagePolicy: FallbackToLogsOnError
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
volumeMounts:
- mountPath: /var/run/configmaps/config
name: config
Expand Down
0 ...ress-to-route-controller-clusterrole.yaml → ...ress-to-route-controller-clusterrole.yaml
View file
Open in desktop
File renamed without changes.
0 ...-route-controller-clusterrolebinding.yaml → ...-route-controller-clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...manager/route-controller-leader-role.yaml → ...route-controller-manager-leader-role.yaml
View file
Open in desktop
File renamed without changes.
0 .../route-controller-leader-rolebinding.yaml → ...ontroller-manager-leader-rolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...ntroller-manager/route-controller-ns.yaml → ...-manager/route-controller-manager-ns.yaml
View file
Open in desktop
File renamed without changes.
0 ...ntroller-manager/route-controller-sa.yaml → ...-manager/route-controller-manager-sa.yaml
View file
Open in desktop
File renamed without changes.
0 ...er/route-controller-separate-sa-role.yaml → ...-controller-manager-separate-sa-role.yaml
View file
Open in desktop
File renamed without changes.
0 ...e-controller-separate-sa-rolebinding.yaml → ...ller-manager-separate-sa-rolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...route-controller-servicemonitor-role.yaml → ...ntroller-manager-servicemonitor-role.yaml
View file
Open in desktop
File renamed without changes.
0 ...ontroller-servicemonitor-rolebinding.yaml → ...r-manager-servicemonitor-rolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...troller-manager/route-controller-svc.yaml → ...manager/route-controller-manager-svc.yaml
View file
Open in desktop
File renamed without changes.
0 ...e-controller-tokenreview-clusterrole.yaml → ...ller-manager-tokenreview-clusterrole.yaml
View file
Open in desktop
File renamed without changes.
0 ...oller-tokenreview-clusterrolebinding.yaml → ...nager-tokenreview-clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
32 changes: 16 additions & 16 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,27 +154,27 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
[]string{
"v3.11.0/openshift-controller-manager/informer-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/informer-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/ingress-to-route-controller-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/ingress-to-route-controller-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/tokenreview-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/tokenreview-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/leader-role.yaml",
"v3.11.0/openshift-controller-manager/leader-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/ns.yaml",
"v3.11.0/openshift-controller-manager/route-controller-informer-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/route-controller-informer-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-leader-role.yaml",
"v3.11.0/openshift-controller-manager/route-controller-leader-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-ns.yaml",
"v3.11.0/openshift-controller-manager/route-controller-sa.yaml",
"v3.11.0/openshift-controller-manager/route-controller-separate-sa-role.yaml",
"v3.11.0/openshift-controller-manager/route-controller-separate-sa-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-servicemonitor-role.yaml",
"v3.11.0/openshift-controller-manager/route-controller-servicemonitor-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-svc.yaml",
"v3.11.0/openshift-controller-manager/route-controller-tokenreview-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/route-controller-tokenreview-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-svc.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-leader-role.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-leader-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-ns.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-sa.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-separate-sa-role.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-separate-sa-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-servicemonitor-role.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-servicemonitor-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-svc.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-tokenreview-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-tokenreview-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-svc.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrole.yaml",
"v3.11.0/openshift-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrolebinding.yaml",
"v3.11.0/openshift-controller-manager/old-leader-role.yaml",
"v3.11.0/openshift-controller-manager/old-leader-rolebinding.yaml",
"v3.11.0/openshift-controller-manager/separate-sa-role.yaml",
Expand Down
12 changes: 6 additions & 6 deletions pkg/operator/sync_openshiftcontrollermanager_v311_00.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ func manageRouteControllerManagerClientCA_v311_00_to_latest(client coreclientv1.
// similar logic for route-controller-manager in manageRouteControllerManagerConfigMap_v311_00_to_latest
func manageOpenShiftControllerManagerConfigMap_v311_00_to_latest(kubeClient kubernetes.Interface, client coreclientv1.ConfigMapsGetter, recorder events.Recorder, operatorConfig *operatorapiv1.OpenShiftControllerManager) (*corev1.ConfigMap, bool, error) {
configMap := resourceread.ReadConfigMapV1OrDie(v311_00_assets.MustAsset("v3.11.0/openshift-controller-manager/cm.yaml"))
defaultConfig := v311_00_assets.MustAsset("v3.11.0/config/defaultconfig.yaml")
requiredConfigMap, _, err := resourcemerge.MergeConfigMap(configMap, "config.yaml", nil, defaultConfig, operatorConfig.Spec.ObservedConfig.Raw, operatorConfig.Spec.UnsupportedConfigOverrides.Raw)
ocmDefaultConfig := v311_00_assets.MustAsset("v3.11.0/config/openshift-controller-manager-defaultconfig.yaml")
requiredConfigMap, _, err := resourcemerge.MergeConfigMap(configMap, "config.yaml", nil, ocmDefaultConfig, operatorConfig.Spec.ObservedConfig.Raw, operatorConfig.Spec.UnsupportedConfigOverrides.Raw)
if err != nil {
return nil, false, err
}
Expand All @@ -311,9 +311,9 @@ func manageOpenShiftControllerManagerConfigMap_v311_00_to_latest(kubeClient kube

// similar logic for route-controller-manager in manageOpenShiftControllerManagerConfigMap_v311_00_to_latest
func manageRouteControllerManagerConfigMap_v311_00_to_latest(kubeClient kubernetes.Interface, client coreclientv1.ConfigMapsGetter, recorder events.Recorder, operatorConfig *operatorapiv1.OpenShiftControllerManager) (*corev1.ConfigMap, bool, error) {
configMap := resourceread.ReadConfigMapV1OrDie(v311_00_assets.MustAsset("v3.11.0/openshift-controller-manager/route-controller-cm.yaml"))
defaultConfig := v311_00_assets.MustAsset("v3.11.0/config/defaultconfig.yaml")
requiredConfigMap, _, err := resourcemerge.MergeConfigMap(configMap, "config.yaml", nil, defaultConfig, operatorConfig.Spec.ObservedConfig.Raw, operatorConfig.Spec.UnsupportedConfigOverrides.Raw)
configMap := resourceread.ReadConfigMapV1OrDie(v311_00_assets.MustAsset("v3.11.0/openshift-controller-manager/route-controller-manager-cm.yaml"))
rcmDefaultConfig := v311_00_assets.MustAsset("v3.11.0/config/route-controller-manager-defaultconfig.yaml")
requiredConfigMap, _, err := resourcemerge.MergeConfigMap(configMap, "config.yaml", nil, rcmDefaultConfig, operatorConfig.Spec.ObservedConfig.Raw, operatorConfig.Spec.UnsupportedConfigOverrides.Raw)
if err != nil {
return nil, false, err
}
Expand Down Expand Up @@ -489,7 +489,7 @@ func manageRouteControllerManagerDeployment_v311_00_to_latest(
generationStatus []operatorapiv1.GenerationStatus,
specAnnotations map[string]string,
) (*appsv1.Deployment, bool, error) {
required := resourceread.ReadDeploymentV1OrDie(v311_00_assets.MustAsset("v3.11.0/openshift-controller-manager/route-controller-deploy.yaml"))
required := resourceread.ReadDeploymentV1OrDie(v311_00_assets.MustAsset("v3.11.0/openshift-controller-manager/route-controller-manager-deploy.yaml"))

if len(imagePullSpec) > 0 {
required.Spec.Template.Spec.Containers[0].Image = imagePullSpec
Expand Down
Loading