Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid namespaces for Kustomize bases #348

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion avro-tools/avro-tools-config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
kind: ConfigMap
metadata:
name: avro-tools-config
namespace: kafka
apiVersion: v1
data:
schema-registry.properties: |-
Expand Down
1 change: 0 additions & 1 deletion avro-tools/rest-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: avro-rest
namespace: kafka
spec:
ports:
- port: 80
Expand Down
1 change: 0 additions & 1 deletion avro-tools/rest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: avro-rest
namespace: kafka
spec:
replicas: 1
selector:
Expand Down
1 change: 0 additions & 1 deletion avro-tools/schemas-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: avro-schemas
namespace: kafka
spec:
ports:
- port: 80
Expand Down
1 change: 0 additions & 1 deletion avro-tools/schemas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: avro-schemas
namespace: kafka
spec:
replicas: 1
selector:
Expand Down
1 change: 0 additions & 1 deletion avro-tools/test/70rest-test1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: batch/v1
kind: Job
metadata:
name: rest-test1
namespace: kafka
spec:
backoffLimit: 1
template:
Expand Down
1 change: 0 additions & 1 deletion consumers-prometheus/kminion-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: kminion
namespace: kafka
labels: &labels
app: kminion
spec:
Expand Down
1 change: 0 additions & 1 deletion consumers-prometheus/kminion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: kminion
namespace: kafka
labels: &labels
app: kminion
spec:
Expand Down
1 change: 0 additions & 1 deletion cruise-control/11cruise-control-config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
kind: ConfigMap
metadata:
name: broker-cruise-control-config
namespace: kafka
apiVersion: v1
data:
cruisecontrol.properties: |-
Expand Down
1 change: 0 additions & 1 deletion cruise-control/20kafka-broker-reporter-patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# kubectl --namespace kafka patch statefulset kafka --patch "$(cat cruise-control/20kafka-broker-reporter-patch.yml)"
metadata:
name: kafka
namespace: kafka
spec:
template:
spec:
Expand Down
1 change: 0 additions & 1 deletion cruise-control/40cruise-control-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ kind: Service
apiVersion: v1
metadata:
name: cruise-control
namespace: kafka
spec:
selector:
app: cruise-control
Expand Down
1 change: 0 additions & 1 deletion cruise-control/50cruise-control.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: cruise-control
namespace: kafka
spec:
selector:
matchLabels:
Expand Down
1 change: 0 additions & 1 deletion cruise-control/topic-create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: batch/v1
kind: Job
metadata:
name: topic-cruise-control-metrics
namespace: kafka
spec:
template:
spec:
Expand Down
1 change: 0 additions & 1 deletion events-kube/topic-create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: batch/v1
kind: Job
metadata:
name: topic-create-event-kube
namespace: kafka
spec:
template:
spec:
Expand Down
1 change: 0 additions & 1 deletion kafka/10broker-config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
kind: ConfigMap
metadata:
name: broker-config
namespace: kafka
apiVersion: v1
data:
init.sh: |-
Expand Down
1 change: 0 additions & 1 deletion kafka/20dns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ apiVersion: v1
kind: Service
metadata:
name: kafka
namespace: kafka
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
spec:
Expand Down
1 change: 0 additions & 1 deletion kafka/30bootstrap-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apiVersion: v1
kind: Service
metadata:
name: bootstrap
namespace: kafka
spec:
ports:
- port: 9092
Expand Down
5 changes: 2 additions & 3 deletions kafka/50kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: kafka
namespace: kafka
spec:
selector:
matchLabels:
Expand All @@ -21,7 +20,7 @@ spec:
terminationGracePeriodSeconds: 30
initContainers:
- name: init-config
image: solsson/kafka:initutils@sha256:8988aca5b34feabe8d7d4e368f74b2ede398f692c7e99a38b262a938d475812c
image: solsson/kafka:initutils@sha256:0cd27e24dea0b27e17e72cd05259a4de394d527473c6707e89f26b87e356a04d
env:
- name: NODE_NAME
valueFrom:
Expand All @@ -45,7 +44,7 @@ spec:
mountPath: /opt/kafka/libs/extensions
containers:
- name: broker
image: solsson/kafka:2.5.1@sha256:5c52620bd8e1bcd47805eb8ca285843168e1684aa27f1ae11ce330c3e12f6b0c
image: solsson/kafka:2.8.0@sha256:69274245ad16fba37e5b277335502a02e41c0efeae3ccbc3374f6cf624b58347
env:
- name: POD_NAME
valueFrom:
Expand Down
1 change: 0 additions & 1 deletion linkedin-burrow/burrow-config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
kind: ConfigMap
metadata:
name: burrow-config
namespace: kafka
apiVersion: v1
data:
burrow.toml: |-
Expand Down
1 change: 0 additions & 1 deletion linkedin-burrow/burrow-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ kind: Service
apiVersion: v1
metadata:
name: burrow
namespace: kafka
spec:
selector:
app: burrow
Expand Down
1 change: 0 additions & 1 deletion linkedin-burrow/burrow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: burrow
namespace: kafka
spec:
replicas: 1
selector:
Expand Down
1 change: 0 additions & 1 deletion maintenance/preferred-replica-election-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: batch/v1
kind: Job
metadata:
name: preferred-replica-election
namespace: kafka
spec:
template:
metadata:
Expand Down
1 change: 0 additions & 1 deletion maintenance/reassign-paritions-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: batch/v1
kind: Job
metadata:
name: reassign-partitions
namespace: kafka
spec:
template:
metadata:
Expand Down
1 change: 0 additions & 1 deletion maintenance/replication-factor-increase-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: batch/v1
kind: Job
metadata:
name: replication-factor-increase
namespace: kafka
spec:
template:
metadata:
Expand Down
4 changes: 2 additions & 2 deletions native/native-image-zookeeper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
spec:
containers:
- name: zookeeper
image: solsson/kafka:native-zookeeper-server-start@sha256:ba3a0632240b8906a3b5bb6441e98ad9d9de73cb716b156ca68f1b435c819e8b
image: solsson/kafka:native-zookeeper-server-start@sha256:eade61d60bb59005d06c8edd6dfebd7f18437e09cc5516916b50096cfbdb1ffe
resources:
requests:
cpu: 10m
Expand All @@ -22,7 +22,7 @@ spec:
spec:
containers:
- name: zookeeper
image: solsson/kafka:native-zookeeper-server-start@sha256:ba3a0632240b8906a3b5bb6441e98ad9d9de73cb716b156ca68f1b435c819e8b
image: solsson/kafka:native-zookeeper-server-start@sha256:eade61d60bb59005d06c8edd6dfebd7f18437e09cc5516916b50096cfbdb1ffe
resources:
requests:
cpu: 10m
Expand Down
4 changes: 2 additions & 2 deletions nonroot/nonroot-image-kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ spec:
spec:
initContainers:
- name: init-config
image: solsson/kafka:initutils-nonroot@sha256:8988aca5b34feabe8d7d4e368f74b2ede398f692c7e99a38b262a938d475812c
image: solsson/kafka:initutils-nonroot@sha256:c239d8c5c767cfe9ffd81cce96af9a61e487400d167f58a7e89478c958ca73b9
containers:
- name: broker
image: solsson/kafka:2.5.1-kafka-server-start@sha256:e4d34530e500eb9724e7778595f4cb244df228336090bb7ed5f7dd7433d4d41d
image: solsson/kafka:2.8.0-kafka-server-start@sha256:825a7e70563a786a43c327f06257c3c502f8bc191d4fb91cf53fdc07aa69703f
args:
- /etc/kafka/server.properties.$(POD_NAME)
8 changes: 4 additions & 4 deletions nonroot/nonroot-image-zookeeper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ spec:
spec:
initContainers:
- name: init-config
image: solsson/kafka:initutils-nonroot@sha256:8988aca5b34feabe8d7d4e368f74b2ede398f692c7e99a38b262a938d475812c
image: solsson/kafka:initutils-nonroot@sha256:c239d8c5c767cfe9ffd81cce96af9a61e487400d167f58a7e89478c958ca73b9
containers:
- name: zookeeper
image: solsson/kafka:2.5.1-zookeeper-server-start@sha256:b3af82c547b8188fa303520901eee6a526c6e34d87cfd78c1569a3a2c96ad5cd
image: solsson/kafka:2.8.0-zookeeper-server-start@sha256:88da70e37b878f5a6edfb3de206f7155b430c605cf956735741d5a011a10b7e9
args:
- /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME)
---
Expand All @@ -23,9 +23,9 @@ spec:
spec:
initContainers:
- name: init-config
image: solsson/kafka:initutils-nonroot@sha256:8988aca5b34feabe8d7d4e368f74b2ede398f692c7e99a38b262a938d475812c
image: solsson/kafka:initutils-nonroot@sha256:c239d8c5c767cfe9ffd81cce96af9a61e487400d167f58a7e89478c958ca73b9
containers:
- name: zookeeper
image: solsson/kafka:2.5.1-zookeeper-server-start@sha256:b3af82c547b8188fa303520901eee6a526c6e34d87cfd78c1569a3a2c96ad5cd
image: solsson/kafka:2.8.0-zookeeper-server-start@sha256:88da70e37b878f5a6edfb3de206f7155b430c605cf956735741d5a011a10b7e9
args:
- /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME)
1 change: 0 additions & 1 deletion outside-services/outside-0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ kind: Service
apiVersion: v1
metadata:
name: outside-0
namespace: kafka
spec:
selector:
app: kafka
Expand Down
1 change: 0 additions & 1 deletion outside-services/outside-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ kind: Service
apiVersion: v1
metadata:
name: outside-1
namespace: kafka
spec:
selector:
app: kafka
Expand Down
1 change: 0 additions & 1 deletion outside-services/outside-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ kind: Service
apiVersion: v1
metadata:
name: outside-2
namespace: kafka
spec:
selector:
app: kafka
Expand Down
1 change: 0 additions & 1 deletion pixy/pixy-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ kind: Service
apiVersion: v1
metadata:
name: pixy
namespace: kafka
spec:
selector:
app: pixy
Expand Down
1 change: 0 additions & 1 deletion pixy/pixy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: pixy
namespace: kafka
labels:
app: pixy
spec:
Expand Down
1 change: 0 additions & 1 deletion prometheus/10-metrics-config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
kind: ConfigMap
metadata:
name: jmx-config
namespace: kafka
apiVersion: v1
data:

Expand Down
1 change: 0 additions & 1 deletion prometheus/50-kafka-jmx-exporter-patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: kafka
namespace: kafka
spec:
template:
metadata:
Expand Down
2 changes: 0 additions & 2 deletions rbac-namespace-default/pod-labler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: pod-labler
namespace: kafka
labels:
origin: github.com_Yolean_kubernetes-kafka
rules:
Expand All @@ -26,7 +25,6 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: kafka-pod-labler
namespace: kafka
labels:
origin: github.com_Yolean_kubernetes-kafka
roleRef:
Expand Down
2 changes: 0 additions & 2 deletions variants/aks-managed/volume-claims.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: kafka
namespace: kafka
spec:
volumeClaimTemplates:
- metadata:
Expand All @@ -19,7 +18,6 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: pzoo
namespace: kafka
spec:
volumeClaimTemplates:
- metadata:
Expand Down
2 changes: 0 additions & 2 deletions variants/aws-gp2/volume-claims.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: kafka
namespace: kafka
spec:
volumeClaimTemplates:
- metadata:
Expand All @@ -19,7 +18,6 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: pzoo
namespace: kafka
spec:
volumeClaimTemplates:
- metadata:
Expand Down
1 change: 0 additions & 1 deletion variants/dev-small/jmx-disable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: kafka
namespace: kafka
spec:
template:
spec:
Expand Down
2 changes: 0 additions & 2 deletions variants/dev-small/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ patchesJson6902:
version: v1
kind: StatefulSet
name: kafka
namespace: kafka
path: listener-localhost.json
- target:
group: apps
version: v1
kind: StatefulSet
name: kafka
namespace: kafka
path: num-partitions-1.json
Loading