From f897596844c53b7ecec6d8c68a8071108bb6771f Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Wed, 22 Aug 2018 11:02:56 +0800
Subject: [PATCH] Remove *_image_tag suffix from ReplicaSet/Deployment
---
.../templates/deploy-cephfs-provisioner.yml.j2 | 2 +-
.../ingress_nginx/templates/deploy-default-backend.yml.j2 | 2 +-
roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2 b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2
index 17c8c3d36..ad90fff05 100644
--- a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2
@@ -2,7 +2,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: cephfs-provisioner-{{ cephfs_provisioner_image_tag }}
+ name: cephfs-provisioner
namespace: {{ cephfs_provisioner_namespace }}
labels:
app: cephfs-provisioner
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/deploy-default-backend.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/deploy-default-backend.yml.j2
index eca5a5084..76d71dd96 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/deploy-default-backend.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/deploy-default-backend.yml.j2
@@ -2,7 +2,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: default-backend-v{{ ingress_nginx_default_backend_image_tag }}
+ name: default-backend
namespace: {{ ingress_nginx_namespace }}
labels:
k8s-app: default-backend
diff --git a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
index 730ce272b..7f4adbffc 100644
--- a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
@@ -2,7 +2,7 @@
apiVersion: apps/v1
kind: ReplicaSet
metadata:
- name: registry-v{{ registry_image_tag }}
+ name: registry
namespace: {{ registry_namespace }}
labels:
k8s-app: registry
--
GitLab