Merge "Remove ssh configurations"

ranger-agent/templates/configmap-etc.yaml

@@ -23,9 +23,6 @@ limitations under the License.
 {{- if empty .Values.conf.ranger_agent.DEFAULT.transport_url -}}
 {{- $_ := tuple "oslo_messaging" "internal" "ranger-agent" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.ranger_agent.DEFAULT "transport_url" -}}
 {{- end -}}
-{{- if empty .Values.conf.ranger_agent.orm.rds_listener_endpoint -}}
-{{- $_ := tuple "ranger_rds" "public" "rds" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.ranger_agent.orm "rds_listener_endpoint" -}}
-{{- end -}}
 {{- if empty .Values.conf.ranger_agent.DEFAULT.ord_server_url -}}
 {{- $_ := tuple "ranger_agent" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.ranger_agent.path.default | set .Values.conf.ranger_agent.DEFAULT "ord_server_url" -}}
 {{- end -}}

ranger-agent/templates/deployment-ranger-agent-engine.yaml

@@ -82,6 +82,7 @@ spec:
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
 {{ dict "envAll" $envAll "application" "ranger_agent" "container" "ranger_agent_engine" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+          {{- if .Values.manifests.secret_ssh_key }}
           env:
             - name: USER
               valueFrom:
@@ -108,6 +109,7 @@ spec:
                 secretKeyRef:
                   name: ranger-agent-ssh-secret
                   key: RANGER_AGENT_SSH_CONFIG
+          {{- end }}
           command:
             - /tmp/ranger-agent-engine.sh
             - start

ranger-agent/values.yaml

@@ -481,22 +481,6 @@ endpoints:
       api:
         default: 9010
         public: 80
-  ranger_rds:
-    name: rds-url
-    hosts:
-      default: rds
-      public: rds-public
-    host_fqdn_override:
-      default: null
-    path:
-      default: /v1/rds/status
-    scheme:
-      default: http
-    port:
-      rds:
-        default: 8777
-        public: 80
-
 
 manifests:
   configmap_bin: true
@@ -547,6 +531,7 @@ conf:
       local_repo: ranger_repo
       resource_status_check_wait: 15
       enable_heat_health_check: true
+      retry_limits: 5
     api:
       host: 0.0.0.0
     database:
@@ -555,6 +540,7 @@ conf:
       auth_type: password
       auth_version: v3
     orm:
+      rds_listener_endpoint: http://localhost:8777/v1/rds/status
       orm_template_repo_url: git@github.com:ranger-agent/templates.git
       repo_pull_check_wait: 2
       retry_limits: 5

ranger/templates/configmap-etc.yaml

@@ -29,7 +29,7 @@ limitations under the License.
 {{- if empty .Values.conf.ranger.DEFAULT.ranger_base -}}
 {{- $_ := set .Values.conf.ranger.DEFAULT "ranger_base" (print .Values.conf.ssh.user_home "/ranger" ) -}}
 {{- end -}}
-{{- if empty .Values.conf.ranger.rds.repo_local_location -}}
+{{- if and (.Values.manifests.secret_ssh_key) (empty .Values.conf.ranger.rds.repo_local_location) -}}
 {{- $_ := set .Values.conf.ranger.rds "repo_local_location" (print .Values.conf.ssh.user_home "/git_repo" ) -}}
 {{- end -}}
 {{- if empty .Values.conf.ranger.keystone_authtoken.project_name -}}

ranger/templates/deployment-ranger-services.yaml

@@ -69,6 +69,7 @@ spec:
 {{ tuple $envAll $envAll.Values.pod.resources.ranger | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
 {{ dict "envAll" $envAll "application" "ranger" "container" "ranger_services" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           env:
+            {{- if .Values.manifests.secret_ssh_key }}
             - name: USER
               valueFrom:
                 secretKeyRef:
@@ -102,14 +103,19 @@ spec:
               value: {{ .Values.conf.ranger.rds.repo_local_location }}
             - name: REMOTE_REPO
               value: {{ .Values.conf.ranger.rds.repo_remote_location }}
+            {{- end }}
           {{- if .Values.conf.ranger.DEFAULT.ranger_agent_https_enable }}
             - name: CERT_LOCATION
               value: {{ .Values.conf.ranger.DEFAULT.ranger_agent_client_cert_path }}
             - name: CERT_FILE
+              {{ if .Values.manifests.secret_ssh_key }}
               valueFrom:
                 secretKeyRef:
                   name: ranger-ssh-secret
                   key: CERT_FILE
+              {{ else }}
+              value: {{ .Values.conf.cert.ranger_agent_client_cert }}
+              {{ end }}
           {{- end }}
             - name: CMS_SERVICE_URL
               value: {{ tuple "cms" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}