From cc75d44266b515f5ee14039f05b3f7545162ac0b Mon Sep 17 00:00:00 2001 From: ston1th Date: Fri, 16 Aug 2019 13:43:56 +0200 Subject: [PATCH] moved pod to deployment --- testapp/certman-istio-operator/Makefile | 2 +- testapp/certman-istio-operator/README.md | 6 ++-- .../certman-istio-operator/deployment.yaml | 32 +++++++++++++++++++ testapp/certman-istio-operator/pod.yaml | 21 ------------ testapp/linkerd-ingress-operator/README.md | 6 ++-- .../linkerd-ingress-operator/deployment.yaml | 32 +++++++++++++++++++ testapp/linkerd-ingress-operator/pod.yaml | 21 ------------ 7 files changed, 71 insertions(+), 49 deletions(-) create mode 100644 testapp/certman-istio-operator/deployment.yaml delete mode 100644 testapp/certman-istio-operator/pod.yaml create mode 100644 testapp/linkerd-ingress-operator/deployment.yaml delete mode 100644 testapp/linkerd-ingress-operator/pod.yaml diff --git a/testapp/certman-istio-operator/Makefile b/testapp/certman-istio-operator/Makefile index fdd7381..c686670 100644 --- a/testapp/certman-istio-operator/Makefile +++ b/testapp/certman-istio-operator/Makefile @@ -1,6 +1,6 @@ CC=docker APP=certman-istio-operator -TAG=127.0.0.1:5000/cert/$(APP):$(VERSION) +TAG=127.0.0.1:5000/istio/$(APP):$(VERSION) all: build push diff --git a/testapp/certman-istio-operator/README.md b/testapp/certman-istio-operator/README.md index 49fb7d6..33acfcb 100644 --- a/testapp/certman-istio-operator/README.md +++ b/testapp/certman-istio-operator/README.md @@ -16,17 +16,17 @@ Grant permissions for the new operator: kubectl apply -f rbac.yaml ``` -Create the operator pod: +Create the operator deployment: ``` -kubectl apply -f pod.yaml +kubectl apply -f deployment.yaml ``` ## Cleanup ``` kubectl -n cert-manager exec certman-istio-operator /cleanup.sh -kubectl delete -f pod.yaml +kubectl delete -f deployment.yaml kubectl delete -f rbac.yaml kubectl delete -f crd.yaml ``` diff --git a/testapp/certman-istio-operator/deployment.yaml b/testapp/certman-istio-operator/deployment.yaml new file mode 100644 index 0000000..fa6e767 --- /dev/null +++ b/testapp/certman-istio-operator/deployment.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: certman-istio-operator + namespace: cert-manager + labels: + app: certman-istio-operator + version: v1 +spec: + replicas: 1 + selector: + matchLabels: + app: certman-istio-operator + version: v1 + template: + metadata: + labels: + app: certman-istio-operator + version: v1 + spec: + serviceAccountName: certman-istio-operator + containers: + - name: certman-istio-operator + image: 127.0.0.1:5000/istio/certman-istio-operator:v1 + resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + imagePullPolicy: Always diff --git a/testapp/certman-istio-operator/pod.yaml b/testapp/certman-istio-operator/pod.yaml deleted file mode 100644 index cb19ad1..0000000 --- a/testapp/certman-istio-operator/pod.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: certman-istio-operator - namespace: cert-manager - labels: - app: certman-istio-operator - version: v1 -spec: - containers: - - name: certman-istio-operator - image: 127.0.0.1:5000/cert/certman-istio-operator:v1 - resources: - limits: - cpu: 100m - memory: 128Mi - requests: - cpu: 100m - memory: 128Mi - imagePullPolicy: Always - serviceAccountName: certman-istio-operator diff --git a/testapp/linkerd-ingress-operator/README.md b/testapp/linkerd-ingress-operator/README.md index c2f1fb9..e30cf5c 100644 --- a/testapp/linkerd-ingress-operator/README.md +++ b/testapp/linkerd-ingress-operator/README.md @@ -12,16 +12,16 @@ Grant permissions for the new operator: kubectl apply -f rbac.yaml ``` -Create the operator pod: +Create the operator deployment: ``` -kubectl apply -f pod.yaml +kubectl apply -f deployment.yaml ``` ## Cleanup ``` -kubectl delete -f pod.yaml +kubectl delete -f deployment.yaml kubectl delete -f rbac.yaml ``` diff --git a/testapp/linkerd-ingress-operator/deployment.yaml b/testapp/linkerd-ingress-operator/deployment.yaml new file mode 100644 index 0000000..8d6b626 --- /dev/null +++ b/testapp/linkerd-ingress-operator/deployment.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: linkerd-ingress-operator + namespace: linkerd + labels: + app: linkerd-ingress-operator + version: v1 +spec: + replicas: 1 + selector: + matchLabels: + app: linkerd-ingress-operator + version: v1 + template: + metadata: + labels: + app: linkerd-ingress-operator + version: v1 + spec: + serviceAccountName: linkerd-ingress-operator + containers: + - name: linkerd-ingress-operator + image: 127.0.0.1:5000/linkerd/linkerd-ingress-operator:v1 + resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + imagePullPolicy: Always diff --git a/testapp/linkerd-ingress-operator/pod.yaml b/testapp/linkerd-ingress-operator/pod.yaml deleted file mode 100644 index 095c3d3..0000000 --- a/testapp/linkerd-ingress-operator/pod.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: linkerd-ingress-operator - namespace: linkerd - labels: - app: linkerd-ingress-operator - version: v1 -spec: - containers: - - name: linkerd-ingress-operator - image: 127.0.0.1:5000/linkerd/linkerd-ingress-operator:v1 - resources: - limits: - cpu: 100m - memory: 128Mi - requests: - cpu: 100m - memory: 128Mi - imagePullPolicy: Always - serviceAccountName: linkerd-ingress-operator