Skip to content
This repository has been archived by the owner on Dec 4, 2023. It is now read-only.

Commit

Permalink
Remove api-server module
Browse files Browse the repository at this point in the history
Remove all code related to api-server as well as build system references
to it.

Moves swagger definition to documentation module for the time being, and
add configuration in documentation to replace properties in
swagger.json. Eventually this should be generated from the CRDs.
  • Loading branch information
lulf committed Dec 10, 2019
1 parent 94e93c7 commit dd34ce4
Show file tree
Hide file tree
Showing 43 changed files with 23 additions and 3,302 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,5 @@ scripts/swagger2markup.jar

# Testing output
artifacts/
api-server-cert/

imageenv.txt
7 changes: 0 additions & 7 deletions HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,9 @@ by setting `DOCKER_ORG=myproject` and `DOCKER_REGISTRY=172.30.1.1:5000` instead.

#### Deploying to a Kubernetes instance assuming already logged in with cluster-admin permissions

*Note*: This assumes you have [OpenSSL](https://www.openssl.org) installed.

kubectl create namespace enmasse-infra
kubectl config set-context $(kubectl config current-context) --namespace=enmasse-infra

mkdir -p api-server-cert
openssl req -new -x509 -batch -nodes -days 11000 -subj "/O=io.enmasse/CN=api-server.enmasse-infra.svc.cluster.local" -out api-server-cert/tls.crt -keyout api-server-cert/tls.key
kubectl create secret tls api-server-cert --cert=api-server-cert/tls.crt --key=api-server-cert/tls.key

kubectl apply -f templates/build/enmasse-latest/install/bundles/enmasse
kubectl apply -f templates/build/enmasse-latest/install/components/example-plans
kubectl apply -f templates/build/enmasse-latest/install/components/example-authservices
Expand Down Expand Up @@ -169,7 +163,6 @@ The following deployment names are available depending on their types and EnMass

* `address-space-controller`
* `admin`
* `api-server`
* `keycloak-controller`
* `standard-controller`
* `service-broker`
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ DOCKER_DIRS = \
agent \
topic-forwarder \
broker-plugin \
api-server \
address-space-controller \
none-authservice \
standard-controller \
Expand Down
3 changes: 0 additions & 3 deletions Makefile.env.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export GOPATH
DOCKER_REGISTRY_PREFIX ?= $(DOCKER_REGISTRY)/
IMAGE_VERSION ?= $(TAG)
ADDRESS_SPACE_CONTROLLER_IMAGE ?= $(DOCKER_REGISTRY_PREFIX)$(DOCKER_ORG)/address-space-controller:$(IMAGE_VERSION)
API_SERVER_IMAGE ?= $(DOCKER_REGISTRY_PREFIX)$(DOCKER_ORG)/api-server:$(IMAGE_VERSION)
STANDARD_CONTROLLER_IMAGE ?= $(DOCKER_REGISTRY_PREFIX)$(DOCKER_ORG)/standard-controller:$(IMAGE_VERSION)
ROUTER_IMAGE ?= quay.io/interconnectedcloud/qdrouterd:1.9.0
BROKER_PLUGIN_IMAGE ?= $(DOCKER_REGISTRY_PREFIX)$(DOCKER_ORG)/broker-plugin:$(IMAGE_VERSION)
Expand Down Expand Up @@ -64,7 +63,6 @@ IMAGE_PULL_POLICY ?= IfNotPresent
endif

IMAGE_ENV=ADDRESS_SPACE_CONTROLLER_IMAGE=$(ADDRESS_SPACE_CONTROLLER_IMAGE) \
API_SERVER_IMAGE=$(API_SERVER_IMAGE) \
STANDARD_CONTROLLER_IMAGE=$(STANDARD_CONTROLLER_IMAGE) \
ROUTER_IMAGE=$(ROUTER_IMAGE) \
BROKER_IMAGE=$(BROKER_IMAGE) \
Expand Down Expand Up @@ -106,7 +104,6 @@ IMAGE_ENV=ADDRESS_SPACE_CONTROLLER_IMAGE=$(ADDRESS_SPACE_CONTROLLER_IMAGE) \

IMAGE_LIST=\
$(ADDRESS_SPACE_CONTROLLER_IMAGE) \
$(API_SERVER_IMAGE) \
$(STANDARD_CONTROLLER_IMAGE) \
$(ROUTER_IMAGE) \
$(BROKER_IMAGE) \
Expand Down
10 changes: 0 additions & 10 deletions ansible/roles/api_server/tasks/main.yml

This file was deleted.

55 changes: 0 additions & 55 deletions ansible/roles/api_service/tasks/main.yml

This file was deleted.

12 changes: 0 additions & 12 deletions api-server/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions api-server/Makefile

This file was deleted.

158 changes: 0 additions & 158 deletions api-server/pom.xml

This file was deleted.

Loading

0 comments on commit dd34ce4

Please sign in to comment.