From bcda3bef1a1ec2223fd528c9dbf8cd87c1230389 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Thu, 18 Oct 2018 13:41:42 +0300 Subject: [PATCH] Refactor non-oss file loading (#697) --- .drone.yml | 3 ++- lib/pharos/cluster_manager.rb | 24 ++++++++++++------- lib/pharos/root_command.rb | 2 -- lib/pharos_cluster.rb | 2 ++ non-oss/pharos_non_oss.rb | 6 +++++ .../addons/kontena-backup/addon.rb | 0 .../kontena-backup/resources/00-namespace.yml | 0 .../resources/01-backup-crd.yml | 0 .../resources/02-schedule-crd.yml | 0 .../resources/03-restore-crd.yml | 0 .../resources/04-config-crd.yml | 0 .../resources/05-download-request-crd.yml | 0 .../06-delete-backup-request-crd.yml | 0 .../resources/07-pod-volume-backup-crd.yml | 0 .../resources/08-pod-volume-restore-crd.yml | 0 .../resources/09-restic-repository-crd.yml | 0 .../resources/10-ark-config.yml.erb | 0 .../resources/11-service-account.yml | 0 .../resources/12-cluster-role-binding.yml | 0 .../resources/13-secrets.yml.erb | 0 .../resources/20-deployment.yml.erb | 0 .../resources/30-restic-daemonset.yml.erb | 0 .../resources/40-toolbox-deployment.yml.erb | 0 .../addons/kontena-lens/addon.rb | 0 .../kontena-lens/resources/01-namespace.yml | 0 .../resources/02-service-account.yml | 0 .../03-user-manager-role-binding.yml | 0 .../resources/03-user-manager-role.yml | 0 .../04-user-management-deployment.yml.erb | 0 .../resources/05-user-management-service.yml | 0 .../06-authenticator-daemonset.yml.erb | 0 .../resources/07-dashboard-deployment.yml.erb | 0 .../resources/08-dashboard-service.yml | 0 .../resources/09-kube-shell-namespace.yml | 0 .../resources/10-redis-deployment.yml.erb | 0 .../resources/11-redis-service.yml | 0 .../kontena-lens/resources/12-ingress.yml.erb | 0 .../resources/13-certificate.yml.erb | 0 .../kontena-lens/resources/14-issuer.yml.erb | 0 .../resources/admin-user-role-binding.yml | 0 .../kontena-lens/resources/cluster_crd.yml | 0 .../kontena-lens/resources/group_crd.yml | 0 .../kube-shell-pod-manager-binding.yml | 0 .../resources/kube-shell-pod-manager-role.yml | 0 .../resources/lens-config-manager-binding.yml | 0 .../resources/lens-config-manager-role.yml | 0 .../lens-operator-cluster-access-binding.yml | 0 .../lens-operator-cluster-access-role.yml | 0 .../pharos-config-reader-role-binding.yml | 0 .../resources/pharos-config-reader-role.yml | 0 .../kontena-lens/resources/user_crd.yml | 0 .../addons/kontena-storage/addon.rb | 0 .../resources/00-namespace.yml | 0 .../resources/01-cluster-crd.yml | 0 .../resources/01-filesystem-crd.yml | 0 .../resources/01-objectstore-crd.yml | 0 .../kontena-storage/resources/01-pool-crd.yml | 0 .../resources/01-volume-crd.yml | 0 .../resources/02-clusterrole.yml | 0 .../resources/02-global-clusterrole.yml | 0 .../kontena-storage/resources/02-role.yml | 0 .../resources/03-serviceaccount.yml | 0 .../resources/04-clusterrolebinding.yml | 0 .../04-global-clusterrolebinding.yml | 0 .../resources/04-rolebinding.yml | 0 .../resources/05-deployment.yml.erb | 0 .../resources/10-namespace.yml | 0 .../resources/11-serviceaccount.yml | 0 .../kontena-storage/resources/12-role.yml | 0 .../resources/13-mgmt-role-binding.yml | 0 .../resources/14-rolebinding.yml | 0 .../resources/15-cluster.yml.erb | 0 .../kontena-storage/resources/20-pool.yml.erb | 0 .../resources/21-storageclass.yml | 0 .../resources/30-toolbox.yml.erb | 0 .../resources/40-filesystem.yml.erb | 0 .../resources/41-clusterrole.yml | 0 .../kontena-storage/resources/41-role.yml | 0 .../resources/41-service-account.yml | 0 .../resources/42-clusterrolebinding.yml | 0 .../resources/42-rolebinding.yml | 0 .../resources/43-deployment.yml.erb | 0 .../resources/44-storageclass.yml.erb | 0 .../commands/license_assign_command.rb | 0 .../commands/license_command.rb | 0 .../{ => pharos_pro}/phases/migrate_master.rb | 0 .../{ => pharos_pro}/phases/migrate_worker.rb | 0 .../phases/validate_version.rb | 0 .../{ => pharos_pro}/addons/backup_spec.rb | 2 +- .../addons/kontena_storage_spec.rb | 2 +- .../commands/license_assign_command_spec.rb | 0 pharos-cluster.gemspec | 13 ++++++---- 92 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 non-oss/pharos_non_oss.rb rename non-oss/{ => pharos_pro}/addons/kontena-backup/addon.rb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/00-namespace.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/01-backup-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/02-schedule-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/03-restore-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/04-config-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/05-download-request-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/06-delete-backup-request-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/07-pod-volume-backup-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/08-pod-volume-restore-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/09-restic-repository-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/10-ark-config.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/11-service-account.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/12-cluster-role-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/13-secrets.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/20-deployment.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/30-restic-daemonset.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-backup/resources/40-toolbox-deployment.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/addon.rb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/01-namespace.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/02-service-account.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/03-user-manager-role-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/03-user-manager-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/04-user-management-deployment.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/05-user-management-service.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/06-authenticator-daemonset.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/07-dashboard-deployment.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/08-dashboard-service.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/09-kube-shell-namespace.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/10-redis-deployment.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/11-redis-service.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/12-ingress.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/13-certificate.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/14-issuer.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/admin-user-role-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/cluster_crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/group_crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/kube-shell-pod-manager-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/kube-shell-pod-manager-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/lens-config-manager-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/lens-config-manager-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/lens-operator-cluster-access-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/lens-operator-cluster-access-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/pharos-config-reader-role-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/pharos-config-reader-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-lens/resources/user_crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/addon.rb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/00-namespace.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/01-cluster-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/01-filesystem-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/01-objectstore-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/01-pool-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/01-volume-crd.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/02-clusterrole.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/02-global-clusterrole.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/02-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/03-serviceaccount.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/04-clusterrolebinding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/04-global-clusterrolebinding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/04-rolebinding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/05-deployment.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/10-namespace.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/11-serviceaccount.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/12-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/13-mgmt-role-binding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/14-rolebinding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/15-cluster.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/20-pool.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/21-storageclass.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/30-toolbox.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/40-filesystem.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/41-clusterrole.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/41-role.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/41-service-account.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/42-clusterrolebinding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/42-rolebinding.yml (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/43-deployment.yml.erb (100%) rename non-oss/{ => pharos_pro}/addons/kontena-storage/resources/44-storageclass.yml.erb (100%) rename non-oss/{ => pharos_pro}/commands/license_assign_command.rb (100%) rename non-oss/{ => pharos_pro}/commands/license_command.rb (100%) rename non-oss/{ => pharos_pro}/phases/migrate_master.rb (100%) rename non-oss/{ => pharos_pro}/phases/migrate_worker.rb (100%) rename non-oss/{ => pharos_pro}/phases/validate_version.rb (100%) rename non-oss/spec/{ => pharos_pro}/addons/backup_spec.rb (98%) rename non-oss/spec/{ => pharos_pro}/addons/kontena_storage_spec.rb (94%) rename non-oss/spec/{ => pharos_pro}/commands/license_assign_command_spec.rb (100%) diff --git a/.drone.yml b/.drone.yml index 19062b440..75a493993 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ pipeline: - gem install bundler -Nf - bundle install --path bundler - bundle exec rspec spec/ - - bundle exec rspec non-oss/spec/ + - PHAROS_NON_OSS=true bundle exec rspec non-oss/spec/ - bundle exec rubocop --fail-level A -S --format c --parallel create_gh_release: image: ubuntu:xenial @@ -35,6 +35,7 @@ pipeline: image: ubuntu:xenial environment: - CPPFLAGS=-P + - PHAROS_NON_OSS=true commands: - ./build/drone/ubuntu.sh when: diff --git a/lib/pharos/cluster_manager.rb b/lib/pharos/cluster_manager.rb index a469e5f73..05ef8d296 100644 --- a/lib/pharos/cluster_manager.rb +++ b/lib/pharos/cluster_manager.rb @@ -8,6 +8,19 @@ class ClusterManager attr_reader :config + def self.phase_dirs + @phase_dirs ||= [ + File.join(__dir__, 'phases') + ] + end + + def self.addon_dirs + @addon_dirs ||= [ + File.join(__dir__, '..', '..', 'addons'), + File.join(Dir.pwd, 'pharos-addons') + ] + end + # @param config [Pharos::Config] # @param pastel [Pastel] def initialize(config, pastel: Pastel.new) @@ -39,15 +52,8 @@ def addon_manager # load phases/addons def load - Pharos::PhaseManager.load_phases( - File.join(__dir__, 'phases'), - File.join(__dir__, '..', '..', 'non-oss', 'phases') - ) - addon_dirs = [ - File.join(__dir__, '..', '..', 'addons'), - File.join(Dir.pwd, 'pharos-addons'), - File.join(__dir__, '..', '..', 'non-oss', 'addons') - ] + @config.addon_paths.map { |d| File.join(Dir.pwd, d) } + Pharos::PhaseManager.load_phases(*self.class.phase_dirs) + addon_dirs = self.class.addon_dirs + @config.addon_paths.map { |d| File.join(Dir.pwd, d) } addon_dirs.keep_if { |dir| File.exist?(dir) } addon_dirs = addon_dirs.map { |dir| Pathname.new(dir).realpath.to_s }.uniq diff --git a/lib/pharos/root_command.rb b/lib/pharos/root_command.rb index 255694379..1a4bfd188 100644 --- a/lib/pharos/root_command.rb +++ b/lib/pharos/root_command.rb @@ -22,5 +22,3 @@ def self.run end end end - -Dir.glob(File.join(__dir__, '..', '..', 'non-oss', 'commands', '*.rb')).each { |non_oss_command| require non_oss_command } diff --git a/lib/pharos_cluster.rb b/lib/pharos_cluster.rb index 595d46da9..48d7b91e7 100644 --- a/lib/pharos_cluster.rb +++ b/lib/pharos_cluster.rb @@ -16,3 +16,5 @@ module Pharos COREDNS_VERSION = '1.1.3' TELEMETRY_VERSION = '0.1.0' end + +require "pharos_non_oss" if $LOAD_PATH.any? { |path| path.end_with?('non-oss') } diff --git a/non-oss/pharos_non_oss.rb b/non-oss/pharos_non_oss.rb new file mode 100644 index 000000000..883f64061 --- /dev/null +++ b/non-oss/pharos_non_oss.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +Pharos::ClusterManager.phase_dirs << File.join(__dir__, 'pharos_pro', 'phases') +Pharos::ClusterManager.addon_dirs << File.join(__dir__, 'pharos_pro', 'addons') + +Dir.glob(File.join(__dir__, 'pharos_pro', 'commands', '*.rb')).each { |command| require command } diff --git a/non-oss/addons/kontena-backup/addon.rb b/non-oss/pharos_pro/addons/kontena-backup/addon.rb similarity index 100% rename from non-oss/addons/kontena-backup/addon.rb rename to non-oss/pharos_pro/addons/kontena-backup/addon.rb diff --git a/non-oss/addons/kontena-backup/resources/00-namespace.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/00-namespace.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/00-namespace.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/00-namespace.yml diff --git a/non-oss/addons/kontena-backup/resources/01-backup-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/01-backup-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/01-backup-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/01-backup-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/02-schedule-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/02-schedule-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/02-schedule-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/02-schedule-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/03-restore-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/03-restore-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/03-restore-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/03-restore-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/04-config-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/04-config-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/04-config-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/04-config-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/05-download-request-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/05-download-request-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/05-download-request-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/05-download-request-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/06-delete-backup-request-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/06-delete-backup-request-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/06-delete-backup-request-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/06-delete-backup-request-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/07-pod-volume-backup-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/07-pod-volume-backup-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/07-pod-volume-backup-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/07-pod-volume-backup-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/08-pod-volume-restore-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/08-pod-volume-restore-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/08-pod-volume-restore-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/08-pod-volume-restore-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/09-restic-repository-crd.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/09-restic-repository-crd.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/09-restic-repository-crd.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/09-restic-repository-crd.yml diff --git a/non-oss/addons/kontena-backup/resources/10-ark-config.yml.erb b/non-oss/pharos_pro/addons/kontena-backup/resources/10-ark-config.yml.erb similarity index 100% rename from non-oss/addons/kontena-backup/resources/10-ark-config.yml.erb rename to non-oss/pharos_pro/addons/kontena-backup/resources/10-ark-config.yml.erb diff --git a/non-oss/addons/kontena-backup/resources/11-service-account.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/11-service-account.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/11-service-account.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/11-service-account.yml diff --git a/non-oss/addons/kontena-backup/resources/12-cluster-role-binding.yml b/non-oss/pharos_pro/addons/kontena-backup/resources/12-cluster-role-binding.yml similarity index 100% rename from non-oss/addons/kontena-backup/resources/12-cluster-role-binding.yml rename to non-oss/pharos_pro/addons/kontena-backup/resources/12-cluster-role-binding.yml diff --git a/non-oss/addons/kontena-backup/resources/13-secrets.yml.erb b/non-oss/pharos_pro/addons/kontena-backup/resources/13-secrets.yml.erb similarity index 100% rename from non-oss/addons/kontena-backup/resources/13-secrets.yml.erb rename to non-oss/pharos_pro/addons/kontena-backup/resources/13-secrets.yml.erb diff --git a/non-oss/addons/kontena-backup/resources/20-deployment.yml.erb b/non-oss/pharos_pro/addons/kontena-backup/resources/20-deployment.yml.erb similarity index 100% rename from non-oss/addons/kontena-backup/resources/20-deployment.yml.erb rename to non-oss/pharos_pro/addons/kontena-backup/resources/20-deployment.yml.erb diff --git a/non-oss/addons/kontena-backup/resources/30-restic-daemonset.yml.erb b/non-oss/pharos_pro/addons/kontena-backup/resources/30-restic-daemonset.yml.erb similarity index 100% rename from non-oss/addons/kontena-backup/resources/30-restic-daemonset.yml.erb rename to non-oss/pharos_pro/addons/kontena-backup/resources/30-restic-daemonset.yml.erb diff --git a/non-oss/addons/kontena-backup/resources/40-toolbox-deployment.yml.erb b/non-oss/pharos_pro/addons/kontena-backup/resources/40-toolbox-deployment.yml.erb similarity index 100% rename from non-oss/addons/kontena-backup/resources/40-toolbox-deployment.yml.erb rename to non-oss/pharos_pro/addons/kontena-backup/resources/40-toolbox-deployment.yml.erb diff --git a/non-oss/addons/kontena-lens/addon.rb b/non-oss/pharos_pro/addons/kontena-lens/addon.rb similarity index 100% rename from non-oss/addons/kontena-lens/addon.rb rename to non-oss/pharos_pro/addons/kontena-lens/addon.rb diff --git a/non-oss/addons/kontena-lens/resources/01-namespace.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/01-namespace.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/01-namespace.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/01-namespace.yml diff --git a/non-oss/addons/kontena-lens/resources/02-service-account.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/02-service-account.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/02-service-account.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/02-service-account.yml diff --git a/non-oss/addons/kontena-lens/resources/03-user-manager-role-binding.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/03-user-manager-role-binding.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/03-user-manager-role-binding.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/03-user-manager-role-binding.yml diff --git a/non-oss/addons/kontena-lens/resources/03-user-manager-role.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/03-user-manager-role.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/03-user-manager-role.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/03-user-manager-role.yml diff --git a/non-oss/addons/kontena-lens/resources/04-user-management-deployment.yml.erb b/non-oss/pharos_pro/addons/kontena-lens/resources/04-user-management-deployment.yml.erb similarity index 100% rename from non-oss/addons/kontena-lens/resources/04-user-management-deployment.yml.erb rename to non-oss/pharos_pro/addons/kontena-lens/resources/04-user-management-deployment.yml.erb diff --git a/non-oss/addons/kontena-lens/resources/05-user-management-service.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/05-user-management-service.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/05-user-management-service.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/05-user-management-service.yml diff --git a/non-oss/addons/kontena-lens/resources/06-authenticator-daemonset.yml.erb b/non-oss/pharos_pro/addons/kontena-lens/resources/06-authenticator-daemonset.yml.erb similarity index 100% rename from non-oss/addons/kontena-lens/resources/06-authenticator-daemonset.yml.erb rename to non-oss/pharos_pro/addons/kontena-lens/resources/06-authenticator-daemonset.yml.erb diff --git a/non-oss/addons/kontena-lens/resources/07-dashboard-deployment.yml.erb b/non-oss/pharos_pro/addons/kontena-lens/resources/07-dashboard-deployment.yml.erb similarity index 100% rename from non-oss/addons/kontena-lens/resources/07-dashboard-deployment.yml.erb rename to non-oss/pharos_pro/addons/kontena-lens/resources/07-dashboard-deployment.yml.erb diff --git a/non-oss/addons/kontena-lens/resources/08-dashboard-service.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/08-dashboard-service.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/08-dashboard-service.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/08-dashboard-service.yml diff --git a/non-oss/addons/kontena-lens/resources/09-kube-shell-namespace.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/09-kube-shell-namespace.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/09-kube-shell-namespace.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/09-kube-shell-namespace.yml diff --git a/non-oss/addons/kontena-lens/resources/10-redis-deployment.yml.erb b/non-oss/pharos_pro/addons/kontena-lens/resources/10-redis-deployment.yml.erb similarity index 100% rename from non-oss/addons/kontena-lens/resources/10-redis-deployment.yml.erb rename to non-oss/pharos_pro/addons/kontena-lens/resources/10-redis-deployment.yml.erb diff --git a/non-oss/addons/kontena-lens/resources/11-redis-service.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/11-redis-service.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/11-redis-service.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/11-redis-service.yml diff --git a/non-oss/addons/kontena-lens/resources/12-ingress.yml.erb b/non-oss/pharos_pro/addons/kontena-lens/resources/12-ingress.yml.erb similarity index 100% rename from non-oss/addons/kontena-lens/resources/12-ingress.yml.erb rename to non-oss/pharos_pro/addons/kontena-lens/resources/12-ingress.yml.erb diff --git a/non-oss/addons/kontena-lens/resources/13-certificate.yml.erb b/non-oss/pharos_pro/addons/kontena-lens/resources/13-certificate.yml.erb similarity index 100% rename from non-oss/addons/kontena-lens/resources/13-certificate.yml.erb rename to non-oss/pharos_pro/addons/kontena-lens/resources/13-certificate.yml.erb diff --git a/non-oss/addons/kontena-lens/resources/14-issuer.yml.erb b/non-oss/pharos_pro/addons/kontena-lens/resources/14-issuer.yml.erb similarity index 100% rename from non-oss/addons/kontena-lens/resources/14-issuer.yml.erb rename to non-oss/pharos_pro/addons/kontena-lens/resources/14-issuer.yml.erb diff --git a/non-oss/addons/kontena-lens/resources/admin-user-role-binding.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/admin-user-role-binding.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/admin-user-role-binding.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/admin-user-role-binding.yml diff --git a/non-oss/addons/kontena-lens/resources/cluster_crd.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/cluster_crd.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/cluster_crd.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/cluster_crd.yml diff --git a/non-oss/addons/kontena-lens/resources/group_crd.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/group_crd.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/group_crd.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/group_crd.yml diff --git a/non-oss/addons/kontena-lens/resources/kube-shell-pod-manager-binding.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/kube-shell-pod-manager-binding.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/kube-shell-pod-manager-binding.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/kube-shell-pod-manager-binding.yml diff --git a/non-oss/addons/kontena-lens/resources/kube-shell-pod-manager-role.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/kube-shell-pod-manager-role.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/kube-shell-pod-manager-role.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/kube-shell-pod-manager-role.yml diff --git a/non-oss/addons/kontena-lens/resources/lens-config-manager-binding.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/lens-config-manager-binding.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/lens-config-manager-binding.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/lens-config-manager-binding.yml diff --git a/non-oss/addons/kontena-lens/resources/lens-config-manager-role.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/lens-config-manager-role.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/lens-config-manager-role.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/lens-config-manager-role.yml diff --git a/non-oss/addons/kontena-lens/resources/lens-operator-cluster-access-binding.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/lens-operator-cluster-access-binding.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/lens-operator-cluster-access-binding.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/lens-operator-cluster-access-binding.yml diff --git a/non-oss/addons/kontena-lens/resources/lens-operator-cluster-access-role.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/lens-operator-cluster-access-role.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/lens-operator-cluster-access-role.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/lens-operator-cluster-access-role.yml diff --git a/non-oss/addons/kontena-lens/resources/pharos-config-reader-role-binding.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/pharos-config-reader-role-binding.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/pharos-config-reader-role-binding.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/pharos-config-reader-role-binding.yml diff --git a/non-oss/addons/kontena-lens/resources/pharos-config-reader-role.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/pharos-config-reader-role.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/pharos-config-reader-role.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/pharos-config-reader-role.yml diff --git a/non-oss/addons/kontena-lens/resources/user_crd.yml b/non-oss/pharos_pro/addons/kontena-lens/resources/user_crd.yml similarity index 100% rename from non-oss/addons/kontena-lens/resources/user_crd.yml rename to non-oss/pharos_pro/addons/kontena-lens/resources/user_crd.yml diff --git a/non-oss/addons/kontena-storage/addon.rb b/non-oss/pharos_pro/addons/kontena-storage/addon.rb similarity index 100% rename from non-oss/addons/kontena-storage/addon.rb rename to non-oss/pharos_pro/addons/kontena-storage/addon.rb diff --git a/non-oss/addons/kontena-storage/resources/00-namespace.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/00-namespace.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/00-namespace.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/00-namespace.yml diff --git a/non-oss/addons/kontena-storage/resources/01-cluster-crd.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/01-cluster-crd.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/01-cluster-crd.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/01-cluster-crd.yml diff --git a/non-oss/addons/kontena-storage/resources/01-filesystem-crd.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/01-filesystem-crd.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/01-filesystem-crd.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/01-filesystem-crd.yml diff --git a/non-oss/addons/kontena-storage/resources/01-objectstore-crd.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/01-objectstore-crd.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/01-objectstore-crd.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/01-objectstore-crd.yml diff --git a/non-oss/addons/kontena-storage/resources/01-pool-crd.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/01-pool-crd.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/01-pool-crd.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/01-pool-crd.yml diff --git a/non-oss/addons/kontena-storage/resources/01-volume-crd.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/01-volume-crd.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/01-volume-crd.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/01-volume-crd.yml diff --git a/non-oss/addons/kontena-storage/resources/02-clusterrole.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/02-clusterrole.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/02-clusterrole.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/02-clusterrole.yml diff --git a/non-oss/addons/kontena-storage/resources/02-global-clusterrole.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/02-global-clusterrole.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/02-global-clusterrole.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/02-global-clusterrole.yml diff --git a/non-oss/addons/kontena-storage/resources/02-role.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/02-role.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/02-role.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/02-role.yml diff --git a/non-oss/addons/kontena-storage/resources/03-serviceaccount.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/03-serviceaccount.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/03-serviceaccount.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/03-serviceaccount.yml diff --git a/non-oss/addons/kontena-storage/resources/04-clusterrolebinding.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/04-clusterrolebinding.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/04-clusterrolebinding.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/04-clusterrolebinding.yml diff --git a/non-oss/addons/kontena-storage/resources/04-global-clusterrolebinding.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/04-global-clusterrolebinding.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/04-global-clusterrolebinding.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/04-global-clusterrolebinding.yml diff --git a/non-oss/addons/kontena-storage/resources/04-rolebinding.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/04-rolebinding.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/04-rolebinding.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/04-rolebinding.yml diff --git a/non-oss/addons/kontena-storage/resources/05-deployment.yml.erb b/non-oss/pharos_pro/addons/kontena-storage/resources/05-deployment.yml.erb similarity index 100% rename from non-oss/addons/kontena-storage/resources/05-deployment.yml.erb rename to non-oss/pharos_pro/addons/kontena-storage/resources/05-deployment.yml.erb diff --git a/non-oss/addons/kontena-storage/resources/10-namespace.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/10-namespace.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/10-namespace.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/10-namespace.yml diff --git a/non-oss/addons/kontena-storage/resources/11-serviceaccount.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/11-serviceaccount.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/11-serviceaccount.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/11-serviceaccount.yml diff --git a/non-oss/addons/kontena-storage/resources/12-role.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/12-role.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/12-role.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/12-role.yml diff --git a/non-oss/addons/kontena-storage/resources/13-mgmt-role-binding.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/13-mgmt-role-binding.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/13-mgmt-role-binding.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/13-mgmt-role-binding.yml diff --git a/non-oss/addons/kontena-storage/resources/14-rolebinding.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/14-rolebinding.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/14-rolebinding.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/14-rolebinding.yml diff --git a/non-oss/addons/kontena-storage/resources/15-cluster.yml.erb b/non-oss/pharos_pro/addons/kontena-storage/resources/15-cluster.yml.erb similarity index 100% rename from non-oss/addons/kontena-storage/resources/15-cluster.yml.erb rename to non-oss/pharos_pro/addons/kontena-storage/resources/15-cluster.yml.erb diff --git a/non-oss/addons/kontena-storage/resources/20-pool.yml.erb b/non-oss/pharos_pro/addons/kontena-storage/resources/20-pool.yml.erb similarity index 100% rename from non-oss/addons/kontena-storage/resources/20-pool.yml.erb rename to non-oss/pharos_pro/addons/kontena-storage/resources/20-pool.yml.erb diff --git a/non-oss/addons/kontena-storage/resources/21-storageclass.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/21-storageclass.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/21-storageclass.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/21-storageclass.yml diff --git a/non-oss/addons/kontena-storage/resources/30-toolbox.yml.erb b/non-oss/pharos_pro/addons/kontena-storage/resources/30-toolbox.yml.erb similarity index 100% rename from non-oss/addons/kontena-storage/resources/30-toolbox.yml.erb rename to non-oss/pharos_pro/addons/kontena-storage/resources/30-toolbox.yml.erb diff --git a/non-oss/addons/kontena-storage/resources/40-filesystem.yml.erb b/non-oss/pharos_pro/addons/kontena-storage/resources/40-filesystem.yml.erb similarity index 100% rename from non-oss/addons/kontena-storage/resources/40-filesystem.yml.erb rename to non-oss/pharos_pro/addons/kontena-storage/resources/40-filesystem.yml.erb diff --git a/non-oss/addons/kontena-storage/resources/41-clusterrole.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/41-clusterrole.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/41-clusterrole.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/41-clusterrole.yml diff --git a/non-oss/addons/kontena-storage/resources/41-role.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/41-role.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/41-role.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/41-role.yml diff --git a/non-oss/addons/kontena-storage/resources/41-service-account.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/41-service-account.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/41-service-account.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/41-service-account.yml diff --git a/non-oss/addons/kontena-storage/resources/42-clusterrolebinding.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/42-clusterrolebinding.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/42-clusterrolebinding.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/42-clusterrolebinding.yml diff --git a/non-oss/addons/kontena-storage/resources/42-rolebinding.yml b/non-oss/pharos_pro/addons/kontena-storage/resources/42-rolebinding.yml similarity index 100% rename from non-oss/addons/kontena-storage/resources/42-rolebinding.yml rename to non-oss/pharos_pro/addons/kontena-storage/resources/42-rolebinding.yml diff --git a/non-oss/addons/kontena-storage/resources/43-deployment.yml.erb b/non-oss/pharos_pro/addons/kontena-storage/resources/43-deployment.yml.erb similarity index 100% rename from non-oss/addons/kontena-storage/resources/43-deployment.yml.erb rename to non-oss/pharos_pro/addons/kontena-storage/resources/43-deployment.yml.erb diff --git a/non-oss/addons/kontena-storage/resources/44-storageclass.yml.erb b/non-oss/pharos_pro/addons/kontena-storage/resources/44-storageclass.yml.erb similarity index 100% rename from non-oss/addons/kontena-storage/resources/44-storageclass.yml.erb rename to non-oss/pharos_pro/addons/kontena-storage/resources/44-storageclass.yml.erb diff --git a/non-oss/commands/license_assign_command.rb b/non-oss/pharos_pro/commands/license_assign_command.rb similarity index 100% rename from non-oss/commands/license_assign_command.rb rename to non-oss/pharos_pro/commands/license_assign_command.rb diff --git a/non-oss/commands/license_command.rb b/non-oss/pharos_pro/commands/license_command.rb similarity index 100% rename from non-oss/commands/license_command.rb rename to non-oss/pharos_pro/commands/license_command.rb diff --git a/non-oss/phases/migrate_master.rb b/non-oss/pharos_pro/phases/migrate_master.rb similarity index 100% rename from non-oss/phases/migrate_master.rb rename to non-oss/pharos_pro/phases/migrate_master.rb diff --git a/non-oss/phases/migrate_worker.rb b/non-oss/pharos_pro/phases/migrate_worker.rb similarity index 100% rename from non-oss/phases/migrate_worker.rb rename to non-oss/pharos_pro/phases/migrate_worker.rb diff --git a/non-oss/phases/validate_version.rb b/non-oss/pharos_pro/phases/validate_version.rb similarity index 100% rename from non-oss/phases/validate_version.rb rename to non-oss/pharos_pro/phases/validate_version.rb diff --git a/non-oss/spec/addons/backup_spec.rb b/non-oss/spec/pharos_pro/addons/backup_spec.rb similarity index 98% rename from non-oss/spec/addons/backup_spec.rb rename to non-oss/spec/pharos_pro/addons/backup_spec.rb index 27c796418..a1ddf1834 100644 --- a/non-oss/spec/addons/backup_spec.rb +++ b/non-oss/spec/pharos_pro/addons/backup_spec.rb @@ -1,5 +1,5 @@ require 'pharos/addon' -require_relative "../../../non-oss/addons/kontena-backup/addon" +require "pharos_pro/addons/kontena-backup/addon" describe Pharos::Addons::KontenaBackup do let(:cluster_config) { Pharos::Config.new( diff --git a/non-oss/spec/addons/kontena_storage_spec.rb b/non-oss/spec/pharos_pro/addons/kontena_storage_spec.rb similarity index 94% rename from non-oss/spec/addons/kontena_storage_spec.rb rename to non-oss/spec/pharos_pro/addons/kontena_storage_spec.rb index 4e12244fd..1e3df1ddd 100644 --- a/non-oss/spec/addons/kontena_storage_spec.rb +++ b/non-oss/spec/pharos_pro/addons/kontena_storage_spec.rb @@ -1,6 +1,6 @@ require 'pharos/addon' require 'pharos/kube' -require './non-oss/addons/kontena-storage/addon' +require 'pharos_pro/addons/kontena-storage/addon' RSpec.describe Pharos::Addons::KontenaStorage do describe '.validate' do diff --git a/non-oss/spec/commands/license_assign_command_spec.rb b/non-oss/spec/pharos_pro/commands/license_assign_command_spec.rb similarity index 100% rename from non-oss/spec/commands/license_assign_command_spec.rb rename to non-oss/spec/pharos_pro/commands/license_assign_command_spec.rb diff --git a/pharos-cluster.gemspec b/pharos-cluster.gemspec index d3337bf0b..2620f4e82 100644 --- a/pharos-cluster.gemspec +++ b/pharos-cluster.gemspec @@ -3,6 +3,13 @@ lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "pharos/version" +files = Dir['README.md', 'LICENSE', 'licenses/*', 'bin/*', 'lib/**/*', 'addons/**/*'] +require_paths = ['lib'] +if ENV['PHAROS_NON_OSS'] == 'true' + files += Dir['non-oss/**/*'] + require_paths << 'non-oss' +end + Gem::Specification.new do |spec| spec.name = "pharos-cluster" spec.version = Pharos::VERSION.sub('-', '.') @@ -13,12 +20,10 @@ Gem::Specification.new do |spec| spec.description = "Kontena Pharos cluster manager" spec.homepage = "https://github.com/kontena/pharos-cluster" - spec.files = `git ls-files -z`.split("\x0").reject do |f| - f.match(%r{^(test|spec|features)/}) - end + spec.files = files spec.bindir = "bin" spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } - spec.require_paths = ["lib"] + spec.require_paths = require_paths spec.required_ruby_version = '~> 2.4' spec.add_runtime_dependency "clamp", "1.2.1"