Skip to content

Added route controller manager #707

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 24, 2023
Merged

Added route controller manager #707

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
8 changes: 4 additions & 4 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "vendor/*|go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2022-05-16T13:33:33Z",
"generated_at": "2023-01-18T16:07:35Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -128,7 +128,7 @@
"hashed_secret": "caa006e5e030a94b2be4abf9d333f029df7fa5fc",
"is_secret": false,
"is_verified": false,
"line_number": 29,
"line_number": 228,
"type": "Base64 High Entropy String",
"verified_result": null
}
Expand All @@ -138,15 +138,15 @@
"hashed_secret": "733c83df12b5f09020cfc0ad9411ba17e7d1a093",
"is_secret": false,
"is_verified": false,
"line_number": 3198,
"line_number": 3617,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "d2e2ab0f407e4ee3cf2ab87d61c31b25a74085e5",
"is_secret": false,
"is_verified": false,
"line_number": 3861,
"line_number": 4280,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
27 changes: 27 additions & 0 deletions assets/route-controller-manager/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
apiVersion: openshiftcontrolplane.config.openshift.io/v1
kind: OpenShiftControllerManagerConfig
build:
buildDefaults:
resources: {}
imageTemplateFormat:
format: {{ imageFor "docker-builder" }}
deployer:
imageTemplateFormat:
format: {{ imageFor "deployer" }}
dockerPullSecret:
internalRegistryHostname: image-registry.openshift-image-registry.svc:5000
ingress:
ingressIPNetworkCIDR: ''
kubeClientConfig:
kubeConfig: /etc/kubernetes/secret/kubeconfig
servingInfo:
certFile: /etc/kubernetes/secret/server.crt
keyFile: /etc/kubernetes/secret/server.key
clientCA: /etc/kubernetes/config/serving-ca.crt
cipherSuites:
- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
- TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
- TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
7 changes: 7 additions & 0 deletions assets/route-controller-manager/route-controller-manager-config-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: route-controller-manager-config
data:
config.yaml: |-
{{ include "route-controller-manager/config.yaml" 4 }}
113 changes: 113 additions & 0 deletions assets/route-controller-manager/route-controller-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
kind: Deployment
apiVersion: apps/v1
metadata:
name: route-controller-manager
spec:
replicas: {{ .Replicas }}
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 0
maxUnavailable: 1
selector:
matchLabels:
app: route-controller-manager
minReadySeconds: 30
template:
metadata:
labels:
app: route-controller-manager
clusterID: "{{ .ClusterID }}"
{{ if .RestartDate }}
annotations:
openshift.io/restartedAt: "{{ .RestartDate }}"
{{ end }}
spec:
tolerations:
- key: "dedicated"
operator: "Equal"
value: "master-{{ .ClusterID }}"
effect: NoSchedule
- key: "multi-az-worker"
operator: "Equal"
value: "true"
effect: NoSchedule
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: dedicated
operator: In
values:
- master-{{ .ClusterID }}
podAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: clusterID
operator: In
values: ["{{ .ClusterID }}"]
topologyKey: "kubernetes.io/hostname"
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app
operator: In
values: ["route-controller-manager"]
topologyKey: "kubernetes.io/hostname"
- labelSelector:
matchExpressions:
- key: app
operator: In
values: ["route-controller-manager"]
topologyKey: "topology.kubernetes.io/zone"
automountServiceAccountToken: false
{{ if .MasterPriorityClass }}
priorityClassName: {{ .MasterPriorityClass }}
{{ end }}
terminationGracePeriodSeconds: 90
Copy link
Contributor

@rtheis rtheis Jan 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this will be OK, but please verify that the pod terminates in under 90 seconds.

Copy link
Author

@Joseph-Goergen Joseph-Goergen Jan 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Terminated within 3 seconds of it being scaled down

root@instance:/armada-openshift-master/lib/roks4/pki# date; kubectl scale deploy -n master-molecule1   route-controller-manager --replicas 0
Mon Jan 23 17:49:07 UTC 2023

root@instance:/armada-openshift-master# while true; do date; kubectl get pods -A | grep route-controller; sleep 5; done
Mon Jan 23 17:49:04 UTC 2023
master-molecule1   route-controller-manager-878d6dc87-2gmh7                1/1     Running            0             29m
master-molecule1   route-controller-manager-878d6dc87-85gkr                1/1     Running            0             29m
master-molecule1   route-controller-manager-878d6dc87-xbrfd                1/1     Running            0             29m
Mon Jan 23 17:49:10 UTC 2023
Mon Jan 23 17:49:17 UTC 2023

containers:
- name: route-controller-manager
{{- if .RouteControllerManagerSecurityContext }}
{{- $securityContext := .RouteControllerManagerSecurityContext }}
securityContext:
runAsUser: {{ $securityContext.RunAsUser }}
{{- end }}
image: {{ imageFor "route-controller-manager" }}
command:
- "route-controller-manager"
args:
- "start"
- "--config=/etc/kubernetes/rcmconfig/config.yaml"
{{ if .RouteControllerManagerResources }}
resources:{{ range .RouteControllerManagerResources }}{{ range .ResourceRequest }}
requests: {{ if .CPU }}
cpu: {{ .CPU }}{{ end }}{{ if .Memory }}
memory: {{ .Memory }}{{ end }}{{ end }}{{ range .ResourceLimit }}
limits: {{ if .CPU }}
cpu: {{ .CPU }}{{ end }}{{ if .Memory }}
memory: {{ .Memory }}{{ end }}{{ end }}{{ end }}
{{ end }}
volumeMounts:
- mountPath: /etc/kubernetes/secret
name: secret
- mountPath: /etc/kubernetes/rcmconfig
name: rcmconfig
- mountPath: /etc/kubernetes/config
name: config
volumes:
- secret:
secretName: route-controller-manager
defaultMode: 0640
name: secret
- configMap:
name: route-controller-manager
name: config
- configMap:
name: route-controller-manager-config
name: rcmconfig
9 changes: 9 additions & 0 deletions cluster.yaml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ openshiftControllerManagerResources:
- resourceLimit:
- cpu: 200m
memory: 200Mi
routeControllerManagerResources:
- resourceRequest:
- cpu: 23m
memory: 78Mi
- resourceLimit:
- cpu: 200m
memory: 200Mi
clusterVersionOperatorResources:
- resourceRequest:
- cpu: 12m
Expand Down Expand Up @@ -198,6 +205,8 @@ openshiftAPIServerSecurityContext:
runAsUser: 1000
openshiftControllerManagerSecurityContext:
runAsUser: 1000
routeControllerManagerSecurityContext:
runAsUser: 1000
clusterPolicyControllerSecurityContext:
runAsUser: 1000
oAuthServerSecurityContext:
Expand Down
2 changes: 2 additions & 0 deletions pkg/api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type ClusterParams struct {
RouterServiceType string `json:"routerServiceType"`
KubeAPIServerResources []ResourceRequirements `json:"kubeAPIServerResources"`
OpenshiftControllerManagerResources []ResourceRequirements `json:"openshiftControllerManagerResources"`
RouteControllerManagerResources []ResourceRequirements `json:"routeControllerManagerResources"`
ClusterVersionOperatorResources []ResourceRequirements `json:"clusterVersionOperatorResources"`
KubeControllerManagerResources []ResourceRequirements `json:"kubeControllerManagerResources"`
OpenshiftAPIServerResources []ResourceRequirements `json:"openshiftAPIServerResources"`
Expand Down Expand Up @@ -67,6 +68,7 @@ type ClusterParams struct {
OpenshiftAPIServerSecurityContext *SecurityContext `json:"openshiftAPIServerSecurityContext"`
OauthAPIServerSecurityContext *SecurityContext `json:"oauthAPIServerSecurityContext"`
OpenshiftControllerManagerSecurityContext *SecurityContext `json:"openshiftControllerManagerSecurityContext"`
RouteControllerManagerSecurityContext *SecurityContext `json:"routeControllerManagerSecurityContext"`
PortierisSecurityContext *SecurityContext `json:"portierisSecurityContext"`
ClusterVersionOperatorSecurityContext *SecurityContext `json:"clusterVersionOperatorSecurityContext"`
KMSSecurityContext *SecurityContext `json:"kmsSecurityContext"`
Expand Down
Loading