From 3d3429764f3f4fd5a49ff7666e4de9cd49633a54 Mon Sep 17 00:00:00 2001 From: SamoKopecky Date: Tue, 12 Apr 2022 13:55:26 +0200 Subject: [PATCH] Create manifests directory structure, create patches - Add secret template to manifests - Move imagestream manifest - Update imagestream api version Signed-off-by: SamoKopecky --- .../base/config-dump.yaml | 1 + manifests/{ => base}/deployment-config.yaml | 21 ++++++++++++------- manifests/{ => base}/imagestream.yaml | 3 ++- manifests/{ => base}/kustomization.yaml | 6 +++++- .../base/peribolos-run.yaml | 1 + manifests/{ => base}/role-binding.yaml | 1 + manifests/{ => base}/role.yaml | 1 + manifests/{ => base}/route.yaml | 4 ++-- manifests/base/secret.yaml | 9 ++++++++ manifests/{ => base}/service-account.yaml | 2 +- manifests/{ => base}/service.yaml | 4 ++-- manifests/overlays/dev/kustomization.yaml | 13 ++++++++++++ manifests/overlays/test/kustomization.yaml | 5 +++++ 13 files changed, 56 insertions(+), 15 deletions(-) rename {pipelines => manifests}/base/config-dump.yaml (99%) rename manifests/{ => base}/deployment-config.yaml (65%) rename manifests/{ => base}/imagestream.yaml (87%) rename manifests/{ => base}/kustomization.yaml (74%) rename {pipelines => manifests}/base/peribolos-run.yaml (99%) rename manifests/{ => base}/role-binding.yaml (98%) rename manifests/{ => base}/role.yaml (98%) rename manifests/{ => base}/route.yaml (59%) create mode 100644 manifests/base/secret.yaml rename manifests/{ => base}/service-account.yaml (62%) rename manifests/{ => base}/service.yaml (78%) create mode 100644 manifests/overlays/dev/kustomization.yaml create mode 100644 manifests/overlays/test/kustomization.yaml diff --git a/pipelines/base/config-dump.yaml b/manifests/base/config-dump.yaml similarity index 99% rename from pipelines/base/config-dump.yaml rename to manifests/base/config-dump.yaml index 47ca70251..639dfedf9 100644 --- a/pipelines/base/config-dump.yaml +++ b/manifests/base/config-dump.yaml @@ -1,3 +1,4 @@ +--- apiVersion: tekton.dev/v1beta1 kind: Task metadata: diff --git a/manifests/deployment-config.yaml b/manifests/base/deployment-config.yaml similarity index 65% rename from manifests/deployment-config.yaml rename to manifests/base/deployment-config.yaml index 3a99d7f4d..f5fb20124 100644 --- a/manifests/deployment-config.yaml +++ b/manifests/base/deployment-config.yaml @@ -2,24 +2,25 @@ kind: DeploymentConfig apiVersion: apps.openshift.io/v1 metadata: - name: peribolos-as-services + name: peribolos-as-service spec: + serviceAccountName: peribolos-as-service test: false replicas: 1 selector: app.kubernetes.io/component: peribolos app.kubernetes.io/managed-by: sig-services - service: peribolos-as-services + service: peribolos-as-service template: metadata: labels: app.kubernetes.io/component: peribolos app.kubernetes.io/managed-by: sig-services - service: peribolos-as-services + service: peribolos-as-service spec: - serviceAccountName: peribolos-as-services + serviceAccountName: peribolos-as-service containers: - - name: peribolos-as-services + - name: peribolos-as-service image: peribolos-service-controller:latest imagePullPolicy: Always env: @@ -27,17 +28,21 @@ spec: valueFrom: secretKeyRef: key: webhook_secret - name: peribolos-as-services + name: peribolos-as-service - name: APP_ID valueFrom: secretKeyRef: key: app_id - name: peribolos-as-services + name: peribolos-as-service - name: PRIVATE_KEY valueFrom: secretKeyRef: key: private_key - name: peribolos-as-services + name: peribolos-as-service + - name: NODE_ENV + value: "production" + - name: LOG_LEVEL + value: "debug" ports: - containerPort: 3000 protocol: TCP diff --git a/manifests/imagestream.yaml b/manifests/base/imagestream.yaml similarity index 87% rename from manifests/imagestream.yaml rename to manifests/base/imagestream.yaml index 8eed6c1a7..7eaad1ab5 100644 --- a/manifests/imagestream.yaml +++ b/manifests/base/imagestream.yaml @@ -1,4 +1,5 @@ -apiVersion: v1 +--- +apiVersion: image.openshift.io/v1 kind: ImageStream metadata: name: peribolos-service-controller diff --git a/manifests/kustomization.yaml b/manifests/base/kustomization.yaml similarity index 74% rename from manifests/kustomization.yaml rename to manifests/base/kustomization.yaml index a35fffac4..1d6c23b14 100644 --- a/manifests/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -1,3 +1,4 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: @@ -8,7 +9,10 @@ resources: - service-account.yaml - role.yaml - role-binding.yaml + - config-dump.yaml + - peribolos-run.yaml + - secret.yaml commonLabels: - app.kubernetes.io/name: peribolos-as-services + app.kubernetes.io/name: peribolos-as-service app.kubernetes.io/component: peribolos app.kubernetes.io/managed-by: sig-services diff --git a/pipelines/base/peribolos-run.yaml b/manifests/base/peribolos-run.yaml similarity index 99% rename from pipelines/base/peribolos-run.yaml rename to manifests/base/peribolos-run.yaml index fd9989ce1..d940cf9dc 100644 --- a/pipelines/base/peribolos-run.yaml +++ b/manifests/base/peribolos-run.yaml @@ -1,3 +1,4 @@ +--- apiVersion: tekton.dev/v1beta1 kind: Task metadata: diff --git a/manifests/role-binding.yaml b/manifests/base/role-binding.yaml similarity index 98% rename from manifests/role-binding.yaml rename to manifests/base/role-binding.yaml index ba757a6b5..c15c5fe83 100644 --- a/manifests/role-binding.yaml +++ b/manifests/base/role-binding.yaml @@ -1,3 +1,4 @@ +--- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/manifests/role.yaml b/manifests/base/role.yaml similarity index 98% rename from manifests/role.yaml rename to manifests/base/role.yaml index 36f24f180..e3f7489f1 100644 --- a/manifests/role.yaml +++ b/manifests/base/role.yaml @@ -1,3 +1,4 @@ +--- kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/manifests/route.yaml b/manifests/base/route.yaml similarity index 59% rename from manifests/route.yaml rename to manifests/base/route.yaml index 01ee7145b..251e2d5df 100644 --- a/manifests/route.yaml +++ b/manifests/base/route.yaml @@ -2,8 +2,8 @@ kind: Route apiVersion: route.openshift.io/v1 metadata: - name: peribolos-as-services + name: peribolos-as-service spec: to: kind: Service - name: peribolos-as-services + name: peribolos-as-service diff --git a/manifests/base/secret.yaml b/manifests/base/secret.yaml new file mode 100644 index 000000000..abfe5ab0e --- /dev/null +++ b/manifests/base/secret.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: peribolos-as-service +data: + app_id: + private_key: + webhook_secret: diff --git a/manifests/service-account.yaml b/manifests/base/service-account.yaml similarity index 62% rename from manifests/service-account.yaml rename to manifests/base/service-account.yaml index 7b4c2f67f..8bb8776a3 100644 --- a/manifests/service-account.yaml +++ b/manifests/base/service-account.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: peribolos-as-services + name: peribolos-as-service diff --git a/manifests/service.yaml b/manifests/base/service.yaml similarity index 78% rename from manifests/service.yaml rename to manifests/base/service.yaml index 2ce8bba10..225e2e398 100644 --- a/manifests/service.yaml +++ b/manifests/base/service.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: - name: peribolos-as-services + name: peribolos-as-service spec: ports: - name: webhook @@ -12,4 +12,4 @@ spec: selector: app.kubernetes.io/component: peribolos app.kubernetes.io/managed-by: sig-services - service: peribolos-as-services + service: peribolos-as-service diff --git a/manifests/overlays/dev/kustomization.yaml b/manifests/overlays/dev/kustomization.yaml new file mode 100644 index 000000000..d6f36332b --- /dev/null +++ b/manifests/overlays/dev/kustomization.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base +patches: + - patch: |- + - op: replace + path: /spec/template/spec/containers/0/env/3/value + value: development + target: + kind: DeploymentConfig + name: peribolos-as-service diff --git a/manifests/overlays/test/kustomization.yaml b/manifests/overlays/test/kustomization.yaml new file mode 100644 index 000000000..c12b15694 --- /dev/null +++ b/manifests/overlays/test/kustomization.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base