From ae2b702ea5edfa84fb97f5bddcfe242ee66ba760 Mon Sep 17 00:00:00 2001 From: "A31882(Wu Yi Chung)" Date: Fri, 24 Nov 2017 16:02:48 +0800 Subject: [PATCH] Replace ReplicationController with Deployment --- docs/kubernetes_deployment.md | 18 +++++++++--------- ...nserver.rc.yaml => adminserver.deploy.yaml} | 10 ++++------ ...bservice.rc.yaml => jobservice.deploy.yaml} | 10 ++++------ .../mysql/{mysql.rc.yaml => mysql.deploy.yaml} | 10 ++++------ .../nginx/{nginx.rc.yaml => nginx.deploy.yaml} | 10 ++++------ .../{registry.rc.yaml => registry.deploy.yaml} | 10 ++++------ .../ui/{ui.rc.yaml => ui.deploy.yaml} | 10 ++++------ 7 files changed, 33 insertions(+), 45 deletions(-) rename make/kubernetes/adminserver/{adminserver.rc.yaml => adminserver.deploy.yaml} (98%) rename make/kubernetes/jobservice/{jobservice.rc.yaml => jobservice.deploy.yaml} (92%) rename make/kubernetes/mysql/{mysql.rc.yaml => mysql.deploy.yaml} (85%) rename make/kubernetes/nginx/{nginx.rc.yaml => nginx.deploy.yaml} (85%) rename make/kubernetes/registry/{registry.rc.yaml => registry.deploy.yaml} (86%) rename make/kubernetes/ui/{ui.rc.yaml => ui.deploy.yaml} (93%) diff --git a/docs/kubernetes_deployment.md b/docs/kubernetes_deployment.md index 5c41b5513..c41076c88 100644 --- a/docs/kubernetes_deployment.md +++ b/docs/kubernetes_deployment.md @@ -4,7 +4,7 @@ This Document decribes how to deploy Harbor on Kubernetes. It has been verified ### Prerequisite -* You should have domain knowledge about Kubernetes (Replication Controller, Service, Persistent Volume, Persistent Volume Claim, Config Map). +* You should have domain knowledge about Kubernetes (Deployment, Service, Persistent Volume, Persistent Volume Claim, Config Map). * **Optional**: Load the docker images onto woker nodes. *If you skip this step, worker node will pull images from Docker Hub when starting the pods.* * Download the offline installer of Harbor v1.2.0 from the [release](https://github.com/vmware/harbor/releases) page. * Uncompress the offline installer and get the images tgz file harbor.*.tgz, transfer it to each of the worker nodes. @@ -50,7 +50,7 @@ These Basic Configuration must be set. Otherwise you can't deploy Harbor on Kube - 10.192.168.5 ``` -- `make/kubernetes/**/*.rc.yaml`: Specify configs of containers. +- `make/kubernetes/**/*.deploy.yaml`: Specify configs of containers. - `make/kubernetes/pv/*.pvc.yaml`: Persistent Volume Claim. You can set capacity of storage in these files. example: @@ -153,13 +153,13 @@ kubectl apply -f make/kubernetes/registry/registry.svc.yaml kubectl apply -f make/kubernetes/ui/ui.svc.yaml kubectl apply -f make/kubernetes/adminserver/adminserver.svc.yaml -# create k8s rc -kubectl apply -f make/kubernetes/registry/registry.rc.yaml -kubectl apply -f make/kubernetes/mysql/mysql.rc.yaml -kubectl apply -f make/kubernetes/jobservice/jobservice.rc.yaml -kubectl apply -f make/kubernetes/ui/ui.rc.yaml -kubectl apply -f make/kubernetes/nginx/nginx.rc.yaml -kubectl apply -f make/kubernetes/adminserver/adminserver.rc.yaml +# create k8s deployment +kubectl apply -f make/kubernetes/registry/registry.deploy.yaml +kubectl apply -f make/kubernetes/mysql/mysql.deploy.yaml +kubectl apply -f make/kubernetes/jobservice/jobservice.deploy.yaml +kubectl apply -f make/kubernetes/ui/ui.deploy.yaml +kubectl apply -f make/kubernetes/nginx/nginx.deploy.yaml +kubectl apply -f make/kubernetes/adminserver/adminserver.deploy.yaml ``` After the pods are running, you can access Harbor's UI via the configured endpoint `10.192.168.5` or issue docker commands such as `docker login 10.192.168.5` to interact with the registry. diff --git a/make/kubernetes/adminserver/adminserver.rc.yaml b/make/kubernetes/adminserver/adminserver.deploy.yaml similarity index 98% rename from make/kubernetes/adminserver/adminserver.rc.yaml rename to make/kubernetes/adminserver/adminserver.deploy.yaml index 70fd5a89a..e1e2efaa3 100644 --- a/make/kubernetes/adminserver/adminserver.rc.yaml +++ b/make/kubernetes/adminserver/adminserver.deploy.yaml @@ -1,13 +1,11 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: adminserver-rc + name: adminserver labels: - name: adminserver-rc + name: adminserver spec: replicas: 1 - selector: - name: adminserver-apps template: metadata: labels: diff --git a/make/kubernetes/jobservice/jobservice.rc.yaml b/make/kubernetes/jobservice/jobservice.deploy.yaml similarity index 92% rename from make/kubernetes/jobservice/jobservice.rc.yaml rename to make/kubernetes/jobservice/jobservice.deploy.yaml index e4f617c4f..4e18db0e5 100644 --- a/make/kubernetes/jobservice/jobservice.rc.yaml +++ b/make/kubernetes/jobservice/jobservice.deploy.yaml @@ -1,13 +1,11 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: jobservice-rc + name: jobservice labels: - name: jobservice-rc + name: jobservice spec: replicas: 1 - selector: - name: jobservice-apps template: metadata: labels: diff --git a/make/kubernetes/mysql/mysql.rc.yaml b/make/kubernetes/mysql/mysql.deploy.yaml similarity index 85% rename from make/kubernetes/mysql/mysql.rc.yaml rename to make/kubernetes/mysql/mysql.deploy.yaml index 78592a5f8..8d1a2809b 100644 --- a/make/kubernetes/mysql/mysql.rc.yaml +++ b/make/kubernetes/mysql/mysql.deploy.yaml @@ -1,13 +1,11 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: mysql-rc + name: mysql labels: - name: mysql-rc + name: mysql spec: replicas: 1 - selector: - name: mysql-apps template: metadata: labels: diff --git a/make/kubernetes/nginx/nginx.rc.yaml b/make/kubernetes/nginx/nginx.deploy.yaml similarity index 85% rename from make/kubernetes/nginx/nginx.rc.yaml rename to make/kubernetes/nginx/nginx.deploy.yaml index fd81b1671..7cb0c270a 100644 --- a/make/kubernetes/nginx/nginx.rc.yaml +++ b/make/kubernetes/nginx/nginx.deploy.yaml @@ -1,13 +1,11 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: nginx-rc + name: nginx labels: - name: nginx-rc + name: nginx spec: replicas: 1 - selector: - name: nginx-apps template: metadata: labels: diff --git a/make/kubernetes/registry/registry.rc.yaml b/make/kubernetes/registry/registry.deploy.yaml similarity index 86% rename from make/kubernetes/registry/registry.rc.yaml rename to make/kubernetes/registry/registry.deploy.yaml index db0962999..aadb2bf78 100644 --- a/make/kubernetes/registry/registry.rc.yaml +++ b/make/kubernetes/registry/registry.deploy.yaml @@ -1,13 +1,11 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: registry-rc + name: registry labels: - name: registry-rc + name: registry spec: replicas: 1 - selector: - name: registry-apps template: metadata: labels: diff --git a/make/kubernetes/ui/ui.rc.yaml b/make/kubernetes/ui/ui.deploy.yaml similarity index 93% rename from make/kubernetes/ui/ui.rc.yaml rename to make/kubernetes/ui/ui.deploy.yaml index 808fa5b00..50c8d190a 100644 --- a/make/kubernetes/ui/ui.rc.yaml +++ b/make/kubernetes/ui/ui.deploy.yaml @@ -1,13 +1,11 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: ui-rc + name: ui labels: - name: ui-rc + name: ui spec: replicas: 1 - selector: - name: ui-apps template: metadata: labels: