Line up default config

- create the namespace that's part of the kustomization
 - get names right in the patches
 - don't use a name prefix, it just confuses things
This commit is contained in:
Michael Bridgen 2020-07-27 13:36:28 +01:00
parent 7931c12aa2
commit ddf988b974
4 changed files with 13 additions and 11 deletions

View File

@ -1,13 +1,6 @@
# Adds namespace to all resources.
namespace: image-automation-system
# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: image-automation-
# Labels to add to all resources and selectors.
#commonLabels:
# someName: someValue
@ -24,6 +17,9 @@ bases:
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
#- ../prometheus
resources:
- namespace.yaml
patchesStrategicMerge:
# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics

View File

@ -3,8 +3,8 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
namespace: system
name: image-automation-controller
namespace: image-automation-system
spec:
template:
spec:

View File

@ -1,8 +1,8 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
namespace: system
name: image-automation-controller
namespace: image-automation-system
spec:
template:
spec:

View File

@ -0,0 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: image-automation-system
labels:
control-plane: controller-manager