diff options
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | dist/vespa.spec | 13 | ||||
-rw-r--r-- | node-admin/CMakeLists.txt | 7 | ||||
-rw-r--r-- | node-admin/OWNERS | 1 | ||||
-rw-r--r-- | node-admin/README.md | 4 | ||||
-rw-r--r-- | node-admin/pom.xml | 175 | ||||
-rw-r--r-- | pom.xml | 1 |
7 files changed, 0 insertions, 202 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 33cf9914a07..7902f9a017e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,6 @@ add_subdirectory(metrics) add_subdirectory(metrics-proxy) add_subdirectory(model-evaluation) add_subdirectory(model-integration) -add_subdirectory(node-admin) add_subdirectory(node-repository) add_subdirectory(orchestrator) add_subdirectory(persistence) diff --git a/dist/vespa.spec b/dist/vespa.spec index 03f789b5852..78b89f7ebdc 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -513,14 +513,12 @@ fi %exclude %{_prefix}/libexec/vespa/common-env.sh %exclude %{_prefix}/libexec/vespa/vespa-wrapper %exclude %{_prefix}/libexec/vespa/find-pid -%exclude %{_prefix}/libexec/vespa/node-admin.sh %exclude %{_prefix}/libexec/vespa/standalone-container.sh %exclude %{_prefix}/libexec/vespa/vespa-curl-wrapper %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/access %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/configserver -%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/node-admin %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/search %{_prefix}/man %{_prefix}/sbin @@ -634,17 +632,6 @@ fi %dir %{_prefix}/lib/jars %{_prefix}/lib/jars/config-model-fat.jar -%files node-admin -%if %{_defattr_is_vespa_vespa} -%defattr(-,%{_vespa_user},%{_vespa_group},-) -%endif -%dir %{_prefix} -%dir %{_prefix}/conf -%{_prefix}/conf/node-admin-app -%dir %{_prefix}/libexec -%dir %{_prefix}/libexec/vespa -%{_prefix}/libexec/vespa/node-admin.sh - %files jars %if %{_defattr_is_vespa_vespa} %defattr(-,%{_vespa_user},%{_vespa_group},-) diff --git a/node-admin/CMakeLists.txt b/node-admin/CMakeLists.txt deleted file mode 100644 index 1056a09976a..00000000000 --- a/node-admin/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install(DIRECTORY DESTINATION logs/vespa/node-admin) -install(FILES target/node-admin-jar-with-dependencies.jar DESTINATION conf/node-admin-app/components) -install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/node-admin-app/components/application-model-jar-with-dependencies.jar) -install_symlink(lib/jars/flags-jar-with-dependencies.jar conf/node-admin-app/components/flags-jar-with-dependencies.jar) -install(FILES src/main/application/services.xml DESTINATION conf/node-admin-app) -install(PROGRAMS src/main/sh/node-admin.sh DESTINATION libexec/vespa) diff --git a/node-admin/OWNERS b/node-admin/OWNERS deleted file mode 100644 index e131dacde49..00000000000 --- a/node-admin/OWNERS +++ /dev/null @@ -1 +0,0 @@ -hakonhall diff --git a/node-admin/README.md b/node-admin/README.md deleted file mode 100644 index d366400ea7e..00000000000 --- a/node-admin/README.md +++ /dev/null @@ -1,4 +0,0 @@ -<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -# Node Admin - -Manages docker containers that run different applications on a host. diff --git a/node-admin/pom.xml b/node-admin/pom.xml deleted file mode 100644 index 75adc2fb380..00000000000 --- a/node-admin/pom.xml +++ /dev/null @@ -1,175 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <version>8-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <artifactId>node-admin</artifactId> - <version>8-SNAPSHOT</version> - <packaging>container-plugin</packaging> - <name>${project.artifactId}</name> - - <dependencies> - <!-- Provided --> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config-provisioning</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-dev</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa-athenz</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>flags</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Compile --> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>orchestrator-restapi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-engine-core</artifactId> - <exclusions> - <exclusion> - <!-- Must use the one provided by Jdisc to prevent two instances of slf4j classes. --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>http-utils</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - - <!-- Test --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>application</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>application-model</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>orchestrator</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>node-repository</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>service-monitor</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>testutil</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.hamcrest</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Needed for node repo mock --> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>zkfacade</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-test</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <attachBundleArtifact>true</attachBundleArtifact> - </configuration> - </plugin> - <plugin> - <!-- Explicit for IntelliJ to detect correct language level from parent --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - </plugins> - </build> -</project> @@ -101,7 +101,6 @@ <module>model-evaluation</module> <module>model-integration</module> <module>node-repository</module> - <module>node-admin</module> <module>opennlp-linguistics</module> <module>orchestrator-restapi</module> <module>orchestrator</module> |