From af906d342ea6791da301fbf2db09bdfd93738692 Mon Sep 17 00:00:00 2001 From: tunahanertekin Date: Wed, 2 Aug 2023 07:48:57 +0000 Subject: [PATCH] bump(charts): bump robot-operator chart to v0.2.5-alpha.30 --- charts/robot-operator/Chart.yaml | 4 ++-- .../robot-operator/templates/deployment.yaml | 22 ++----------------- .../templates/discoveryserver-crd.yaml | 8 +++++++ .../robot-operator/templates/robot-crd.yaml | 15 +++++++++++++ .../templates/robotartifact-crd.yaml | 15 +++++++++++++ .../templates/serviceaccount.yaml | 12 ++++++++++ charts/robot-operator/values.yaml | 13 ++++++++++- 7 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 charts/robot-operator/templates/serviceaccount.yaml diff --git a/charts/robot-operator/Chart.yaml b/charts/robot-operator/Chart.yaml index 5e94cd6..bd202fa 100644 --- a/charts/robot-operator/Chart.yaml +++ b/charts/robot-operator/Chart.yaml @@ -13,9 +13,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.5-alpha.29 +version: 0.2.5-alpha.30 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.2.5-alpha.29" +appVersion: "v0.2.5-alpha.30" diff --git a/charts/robot-operator/templates/deployment.yaml b/charts/robot-operator/templates/deployment.yaml index d490b2f..6b625ea 100644 --- a/charts/robot-operator/templates/deployment.yaml +++ b/charts/robot-operator/templates/deployment.yaml @@ -1,14 +1,3 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "robot-operator.fullname" . }}-controller-manager - labels: - app.kuberentes.io/instance: controller-manager - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: robot-operator - app.kubernetes.io/part-of: robot-operator - {{- include "robot-operator.labels" . | nindent 4 }} ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -50,11 +39,7 @@ spec: values: - linux containers: - - args: - - --secure-listen-address=0.0.0.0:8443 - - --upstream=http://127.0.0.1:8080/ - - --logtostderr=true - - --v=0 + - args: {{- toYaml .Values.controllerManager.kubeRbacProxy.args | nindent 8 }} env: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ quote .Values.kubernetesClusterDomain }} @@ -69,10 +54,7 @@ spec: 10 }} securityContext: {{- toYaml .Values.controllerManager.kubeRbacProxy.containerSecurityContext | nindent 10 }} - - args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=127.0.0.1:8080 - - --leader-elect + - args: {{- toYaml .Values.controllerManager.manager.args | nindent 8 }} command: - /manager env: diff --git a/charts/robot-operator/templates/discoveryserver-crd.yaml b/charts/robot-operator/templates/discoveryserver-crd.yaml index e6a8be8..8a398b8 100644 --- a/charts/robot-operator/templates/discoveryserver-crd.yaml +++ b/charts/robot-operator/templates/discoveryserver-crd.yaml @@ -42,6 +42,12 @@ spec: it takes cloud instance's name automatically. Should be set if the type is `Client`. type: string + domainID: + default: 0 + description: ROS domain ID for robot. See https://docs.ros.org/en/foxy/Concepts/About-Domain-ID.html. + maximum: 101 + minimum: 0 + type: integer hostname: description: If instance type is `Server`, it can be an arbitrary value. If instance type is `Client`, it should be the same with Server's @@ -99,6 +105,8 @@ spec: tries to connect a `Server` instance and hold `Server` configuration in a ConfigMap. type: string + required: + - domainID type: object status: description: Most recently observed status of the DiscoveryServer. diff --git a/charts/robot-operator/templates/robot-crd.yaml b/charts/robot-operator/templates/robot-crd.yaml index 17b7af8..be64c14 100644 --- a/charts/robot-operator/templates/robot-crd.yaml +++ b/charts/robot-operator/templates/robot-crd.yaml @@ -225,6 +225,12 @@ spec: it takes cloud instance's name automatically. Should be set if the type is `Client`. type: string + domainID: + default: 0 + description: ROS domain ID for robot. See https://docs.ros.org/en/foxy/Concepts/About-Domain-ID.html. + maximum: 101 + minimum: 0 + type: integer hostname: description: If instance type is `Server`, it can be an arbitrary value. If instance type is `Client`, it should be the same with @@ -282,6 +288,8 @@ spec: If `Client`, instance tries to connect a `Server` instance and hold `Server` configuration in a ConfigMap. type: string + required: + - domainID type: object distributions: description: ROS 2 distributions to be used. You can select multiple @@ -299,6 +307,12 @@ spec: maxItems: 2 minItems: 1 type: array + domainID: + default: 0 + description: ROS domain ID for robot. See https://docs.ros.org/en/foxy/Concepts/About-Domain-ID.html. + maximum: 101 + minimum: 0 + type: integer launchManagerTemplates: description: '[*alpha*] Launch manager template for initial configuration.' items: @@ -852,6 +866,7 @@ spec: type: object required: - distributions + - domainID - rmwImplementation type: object status: diff --git a/charts/robot-operator/templates/robotartifact-crd.yaml b/charts/robot-operator/templates/robotartifact-crd.yaml index e8c535d..239b790 100644 --- a/charts/robot-operator/templates/robotartifact-crd.yaml +++ b/charts/robot-operator/templates/robotartifact-crd.yaml @@ -204,6 +204,12 @@ spec: it takes cloud instance's name automatically. Should be set if the type is `Client`. type: string + domainID: + default: 0 + description: ROS domain ID for robot. See https://docs.ros.org/en/foxy/Concepts/About-Domain-ID.html. + maximum: 101 + minimum: 0 + type: integer hostname: description: If instance type is `Server`, it can be an arbitrary value. If instance type is `Client`, it should be the same with @@ -261,6 +267,8 @@ spec: If `Client`, instance tries to connect a `Server` instance and hold `Server` configuration in a ConfigMap. type: string + required: + - domainID type: object distributions: description: ROS 2 distributions to be used. You can select multiple @@ -278,6 +286,12 @@ spec: maxItems: 2 minItems: 1 type: array + domainID: + default: 0 + description: ROS domain ID for robot. See https://docs.ros.org/en/foxy/Concepts/About-Domain-ID.html. + maximum: 101 + minimum: 0 + type: integer launchManagerTemplates: description: '[*alpha*] Launch manager template for initial configuration.' items: @@ -831,6 +845,7 @@ spec: type: object required: - distributions + - domainID - rmwImplementation type: object type: object diff --git a/charts/robot-operator/templates/serviceaccount.yaml b/charts/robot-operator/templates/serviceaccount.yaml new file mode 100644 index 0000000..7ad70da --- /dev/null +++ b/charts/robot-operator/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "robot-operator.fullname" . }}-controller-manager + labels: + app.kuberentes.io/instance: controller-manager + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: robot-operator + app.kubernetes.io/part-of: robot-operator + {{- include "robot-operator.labels" . | nindent 4 }} + annotations: + {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }} \ No newline at end of file diff --git a/charts/robot-operator/values.yaml b/charts/robot-operator/values.yaml index 5a39ba3..22ac3d8 100644 --- a/charts/robot-operator/values.yaml +++ b/charts/robot-operator/values.yaml @@ -1,5 +1,10 @@ controllerManager: kubeRbacProxy: + args: + - --secure-listen-address=0.0.0.0:8443 + - --upstream=http://127.0.0.1:8080/ + - --logtostderr=true + - --v=0 containerSecurityContext: allowPrivilegeEscalation: false capabilities: @@ -16,6 +21,10 @@ controllerManager: cpu: 5m memory: 64Mi manager: + args: + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:8080 + - --leader-elect containerSecurityContext: allowPrivilegeEscalation: false capabilities: @@ -23,7 +32,7 @@ controllerManager: - ALL image: repository: robolaunchio/robot-controller-manager - tag: v0.2.5-alpha.29 + tag: v0.2.5-alpha.30 resources: limits: cpu: 500m @@ -32,6 +41,8 @@ controllerManager: cpu: 10m memory: 64Mi replicas: 1 + serviceAccount: + annotations: {} kubernetesClusterDomain: cluster.local metricsService: ports: