From 9a6830ab0d5e36411af10306243d6410a18ed3f7 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Mon, 14 Oct 2024 18:06:10 -0400 Subject: [PATCH] 21905: Remove RVM support Arvados no longer supports RVM as of 3.0. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- arvados/api/package/install.sls | 9 +- arvados/controller/package/install.sls | 9 +- arvados/defaults.yaml | 3 - arvados/osfamilymap.yaml | 4 - ...9B6B1796C275462A1703113804BB82D39DC0E3.key | 380 ------------------ ...2BAF1CF37B13E2069D6956105BD0E739499BDB.key | 51 --- arvados/ruby/package/install.sls | 79 ---- arvados/shell/package/install.sls | 6 +- arvados/shell/resources/virtual_machines.sls | 18 +- arvados/workbench/package/install.sls | 6 +- pillar.example | 3 +- test/salt/pillar/examples/nginx_passenger.sls | 6 - 12 files changed, 11 insertions(+), 563 deletions(-) delete mode 100644 arvados/ruby/package/files/default/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key delete mode 100644 arvados/ruby/package/files/default/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key diff --git a/arvados/api/package/install.sls b/arvados/api/package/install.sls index 1c487a6..bade7ee 100644 --- a/arvados/api/package/install.sls +++ b/arvados/api/package/install.sls @@ -11,10 +11,6 @@ {%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %} {%- from tplroot ~ "/map.jinja" import arvados with context %} -{%- if arvados.ruby.manage_ruby %} - {%- set ruby_dep = 'rvm' if arvados.ruby.use_rvm else 'pkg' %} -{%- endif %} - include: # The API server requires a valid config BEFORE installing... - {{ sls_config_file }} @@ -29,13 +25,10 @@ arvados-api-package-install-gems-deps-pkg-installed: arvados-api-package-install-gem-{{ gm }}-installed: gem.installed: - name: {{ gm }} - {%- if arvados.ruby.use_rvm %} - - ruby: {{ arvados.ruby.pkg }} - {%- endif %} - require: - pkg: arvados-api-package-install-gems-deps-pkg-installed {%- if arvados.ruby.manage_ruby %} - - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed + - pkg: arvados-ruby-package-install-ruby-pkg-installed {%- endif %} - require_in: - pkg: arvados-api-package-install-pkg-installed diff --git a/arvados/controller/package/install.sls b/arvados/controller/package/install.sls index a820045..606790c 100644 --- a/arvados/controller/package/install.sls +++ b/arvados/controller/package/install.sls @@ -10,10 +10,6 @@ {%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %} {%- from tplroot ~ "/map.jinja" import arvados with context %} -{%- if arvados.ruby.manage_ruby %} - {%- set ruby_dep = 'rvm' if arvados.ruby.use_rvm else 'pkg' %} -{%- endif %} - include: - {{ sls_ruby_install }} @@ -26,13 +22,10 @@ arvados-controller-package-install-gems-deps-pkg-installed: arvados-controller-package-install-gem-{{ gm }}-installed: gem.installed: - name: {{ gm }} - {%- if arvados.ruby.use_rvm %} - - ruby: {{ arvados.ruby.pkg }} - {%- endif %} - require: - pkg: arvados-controller-package-install-gems-deps-pkg-installed {%- if arvados.ruby.manage_ruby %} - - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed + - pkg: arvados-ruby-package-install-ruby-pkg-installed {%- endif %} - require_in: - pkg: arvados-controller-package-install-pkg-installed diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml index 1ff94dd..ea3b186 100644 --- a/arvados/defaults.yaml +++ b/arvados/defaults.yaml @@ -15,9 +15,6 @@ arvados: ruby: manage_ruby: false pkg: ruby - use_rvm: false - # Only used if using RVM - rvm_gemset: arvados manage_gems_deps: false gems_deps: diff --git a/arvados/osfamilymap.yaml b/arvados/osfamilymap.yaml index 562b9a3..6bccda2 100644 --- a/arvados/osfamilymap.yaml +++ b/arvados/osfamilymap.yaml @@ -29,10 +29,6 @@ RedHat: key_url: 'http://rpm.arvados.org/RHEL/RPM-GPG-KEY-arvados' ruby: - manage_ruby: true - use_rvm: true - - pkg: ruby-2.7.2 gems_deps: - curl - gcc diff --git a/arvados/ruby/package/files/default/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key b/arvados/ruby/package/files/default/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key deleted file mode 100644 index 7250e23..0000000 --- a/arvados/ruby/package/files/default/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key +++ /dev/null @@ -1,380 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: keyserver.ubuntu.com - -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 -cXLIBM5q6AezO7U4Cro= -=HTK2 ------END PGP PUBLIC KEY BLOCK----- diff --git a/arvados/ruby/package/files/default/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key b/arvados/ruby/package/files/default/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key deleted file mode 100644 index e5c7174..0000000 --- a/arvados/ruby/package/files/default/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -iWTuv7mXY0bNG+s= -=X3ZS ------END PGP PUBLIC KEY BLOCK----- diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls index 2ec0c09..5520e62 100644 --- a/arvados/ruby/package/install.sls +++ b/arvados/ruby/package/install.sls @@ -11,86 +11,7 @@ {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} {%- if arvados.ruby.manage_ruby %} - - {%- if arvados.ruby.use_rvm %} - - # Centos 7 has a too old postgresql package and we need a newer one - {%- if grains.os_family in ('RedHat',) %} -arvados-ruby-package-install-ruby-rvm-deps-centos-scl-release-pkg-installed: - pkg.installed: - - name: centos-release-scl - -arvados-ruby-package-install-ruby-rvm-deps-rh-postgres-libs-pkg-installed: - pkg.installed: - - name: rh-postgresql{{ arvados.api.postgresql_version }}-postgresql-libs - - unless: rpm -q postgresql{{ arvados.api.postgresql_version }}-libs - - require_in: - - cmd: arvados-ruby-package-install-rvm-cmd-run-curl - {%- endif %} - - # Centos 7 has no python3-gnupg package, so using gpg.present - # will fail when it can't list the existing keys. - # Doing it the hard way -arvados-ruby-package-install-file-managed-gpg-michal-papis: - file.managed: - - name: /tmp/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key - - source: {{ files_switch(['gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key'], - lookup='arvados-ruby-package-install-file-managed-gpg-michal-papis', - use_subpath=True - ) - }} - - mode: '0644' - - user: root - - group: root - - unless: - - gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3 - -arvados-ruby-package-install-cmd-run-gpg-michal-papis: - cmd.run: - - name: gpg --import /tmp/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key - - unless: - - gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3 - -arvados-ruby-package-install-file-managed-gpg-piotr-kuczynski: - file.managed: - - name: /tmp/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key - - source: {{ files_switch(['gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key'], - lookup='arvados-ruby-package-install-file-managed-gpg-piotr-kuczynski', - use_subpath=True - ) - }} - - mode: '0644' - - user: root - - group: root - - unless: - - gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - -arvados-ruby-package-install-cmd-run-gpg-piotr-kuczynski: - cmd.run: - - name: gpg --import /tmp/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key - - unless: - - gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - -arvados-ruby-package-install-rvm-cmd-run-curl: - cmd.run: - - name: curl -s -L http://get.rvm.io | bash -s stable - - unless: test -f /usr/local/rvm/bin/rvm - - require: - - cmd: arvados-ruby-package-install-cmd-run-gpg-michal-papis - - cmd: arvados-ruby-package-install-cmd-run-gpg-piotr-kuczynski - -arvados-ruby-package-install-ruby-rvm-installed: - rvm.installed: - - name: {{ arvados.ruby.pkg }} - - default: true - - require: - - cmd: arvados-ruby-package-install-rvm-cmd-run-curl - - {%- else %} - arvados-ruby-package-install-ruby-pkg-installed: pkg.installed: - name: {{ arvados.ruby.pkg }} - - {%- endif %} {%- endif %} diff --git a/arvados/shell/package/install.sls b/arvados/shell/package/install.sls index 7a0698f..fa6291f 100644 --- a/arvados/shell/package/install.sls +++ b/arvados/shell/package/install.sls @@ -6,10 +6,6 @@ {%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %} {%- from tplroot ~ "/map.jinja" import arvados with context %} -{%- if arvados.ruby.manage_ruby %} - {%- set ruby_dep = 'rvm' if arvados.ruby.use_rvm else 'pkg' %} -{%- endif %} - include: - {{ sls_ruby_install }} @@ -43,7 +39,7 @@ arvados-shell-package-install-gem-{{ gm }}-installed: - name: {{ gm }} - require: {%- if arvados.ruby.manage_ruby %} - - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed + - pkg: arvados-ruby-package-install-ruby-pkg-installed {%- endif %} - pkg: arvados-shell-package-install-gems-deps-pkg-installed {%- endfor %} diff --git a/arvados/shell/resources/virtual_machines.sls b/arvados/shell/resources/virtual_machines.sls index 18e4c16..767fed4 100644 --- a/arvados/shell/resources/virtual_machines.sls +++ b/arvados/shell/resources/virtual_machines.sls @@ -15,9 +15,6 @@ {%- set api_token = arvados.cluster.tokens.system_root | yaml_encode %} {%- set api_host = arvados.cluster.Services.Controller.ExternalURL | regex_replace('^http(s?)://', '', ignorecase=true) %} -{%- set arv_command = '/usr/local/rvm/bin/rvm-exec default arv' - if arvados.ruby.manage_ruby and arvados.ruby.use_rvm - else 'arv' %} include: - ..package {# - {{ sls_config_file }} #} @@ -33,8 +30,8 @@ arvados-shell-resources-virtual-machines-jq-pkg-installed: {%- set cmd_query_vm_uuid = 'ARVADOS_API_TOKEN=' ~ api_token ~ ' ' ~ 'ARVADOS_API_HOST=' ~ api_host ~ ' ' ~ - 'ARVADOS_API_HOST_INSECURE=' ~ arvados_api_host_insecure ~ ' ' ~ - arv_command ~ ' --short virtual_machine list' ~ + 'ARVADOS_API_HOST_INSECURE=' ~ arvados_api_host_insecure ~ + ' arv --short virtual_machine list' ~ ' --filters \'[["hostname", "=", "' ~ vm_name ~ '"]]\'' %} @@ -46,7 +43,7 @@ arvados-shell-resources-virtual-machines-{{ vm }}-record-cmd-run: - ARVADOS_API_HOST: {{ api_host }} - ARVADOS_API_HOST_INSECURE: {{ arvados.cluster.tls.insecure | default(false) }} - name: | - {{ arv_command }} --format=uuid \ + arv --format=uuid \ virtual_machine \ create \ --virtual-machine '{"hostname":"{{ vm_name }}" }' @@ -64,9 +61,6 @@ arvados-shell-resources-virtual-machines-{{ vm }}-record-cmd-run: # the file content is a token uuid :| arvados-shell-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run: cmd.run: - {%- if arvados.ruby.manage_ruby and arvados.ruby.use_rvm %} - - prepend_path: /usr/local/rvm/gems/{{ arvados.ruby.pkg }}/bin - {%- endif %} - name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/{{ vm }} - require: - cmd: arvados-shell-resources-virtual-machines-{{ vm }}-record-cmd-run @@ -79,8 +73,8 @@ arvados-shell-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run: {%- set cmd_query_scoped_token_url = 'VM_UUID=$(cat /tmp/' ~ vm ~ ') && ' ~ 'ARVADOS_API_TOKEN=' ~ api_token ~ ' ' ~ 'ARVADOS_API_HOST=' ~ api_host ~ ' ' ~ - 'ARVADOS_API_HOST_INSECURE=' ~ arvados_api_host_insecure ~ ' ' ~ - arv_command ~ ' api_client_authorization list |' ~ + 'ARVADOS_API_HOST_INSECURE=' ~ arvados_api_host_insecure ~ + ' arv api_client_authorization list |' ~ ' /usr/bin/jq -e \'.items[].scopes[] | select(. == "GET ' ~ '/arvados/v1/virtual_machines/\'${VM_UUID}\'/logins")\' && ' ~ 'unset VM_UUID' @@ -95,7 +89,7 @@ arvados-shell-resources-virtual-machines-{{ vm }}-scoped-token-cmd-run: - ARVADOS_API_HOST_INSECURE: {{ arvados.cluster.tls.insecure | default(false) }} - name: | VM_UUID=$(cat /tmp/{{ vm }}) && - {{ arv_command }} --format=uuid \ + arv --format=uuid \ api_client_authorization \ create \ --api-client-authorization '{"scopes":["GET /arvados/v1/virtual_machines/'${VM_UUID}'/logins"]}' diff --git a/arvados/workbench/package/install.sls b/arvados/workbench/package/install.sls index 0eb191e..6c63186 100644 --- a/arvados/workbench/package/install.sls +++ b/arvados/workbench/package/install.sls @@ -11,10 +11,6 @@ {%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %} {%- from tplroot ~ "/map.jinja" import arvados with context %} -{%- if arvados.ruby.manage_ruby %} - {%- set ruby_dep = 'rvm' if arvados.ruby.use_rvm else 'pkg' %} -{%- endif %} - include: # The workbench server requires a valid config BEFORE installing... - {{ sls_config_file }} @@ -32,6 +28,6 @@ arvados-workbench-package-install-pkg-installed: - refresh: true - require: {%- if arvados.ruby.manage_ruby %} - - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed + - pkg: arvados-ruby-package-install-ruby-pkg-installed {%- endif %} - sls: {{ sls_config_file }} diff --git a/pillar.example b/pillar.example index 2347f57..7a3c6cc 100644 --- a/pillar.example +++ b/pillar.example @@ -30,8 +30,7 @@ arvados: # We set these to `true` here for testing purposes. # They both default to `false`. manage_ruby: true - use_rvm: false # If you want to use rvm. Defaults to true for centos-7 - # pkg: ruby # Can specify a version like ruby-2.5.7 for rvm + # pkg: ruby # Can specify a backport name like ruby3.2 manage_gems_deps: true # gems_deps: # - curl diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls index 33699cd..e5e37d2 100644 --- a/test/salt/pillar/examples/nginx_passenger.sls +++ b/test/salt/pillar/examples/nginx_passenger.sls @@ -9,18 +9,12 @@ {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' if grains.osfinger in ('CentOS Linux-7',) else '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %} -{%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.7.2/bin/ruby' - if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else - '/usr/bin/ruby' %} ### NGINX nginx: install_from_phusionpassenger: true lookup: passenger_package: {{ passenger_pkg }} - ### PASSENGER - passenger: - passenger_ruby: {{ passenger_ruby }} ### SERVER server: -- 2.30.2