Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: bridge
name: {{ .Values.namespace }}
labels:
com.docker.compose.project: bridge
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: bridge
namespace: bridge
name: {{ .Values.projectName }}
namespace: {{ .Values.namespace }}
labels:
com.docker.compose.project: bridge
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ metadata:
com.docker.compose.service: serviceA
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
replicas: {{ .Values.deployment.defaultReplicas }}
selector:
matchLabels:
com.docker.compose.project: bridge
com.docker.compose.service: serviceA
strategy:
type: Recreate
type: {{ .Values.deployment.strategy }}
template:
metadata:
labels:
Expand All @@ -28,6 +28,10 @@ spec:
- name: servicea
image: {{ .Values.serviceA.image }}
imagePullPolicy: {{ .Values.serviceA.imagePullPolicy }}
resources:
limits:
cpu: {{ .Values.resources.defaultCpuLimit }}
memory: {{ .Values.resources.defaultMemoryLimit }}
ports:
- name: servicea-8080
containerPort: 8080
Expand All @@ -39,7 +43,7 @@ spec:
volumes:
- name: etc-my-config1-txt
configMap:
name: bridge
name: {{ .Values.projectName }}
items:
- key: my-config
path: my-config
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
com.docker.compose.service: serviceA
app.kubernetes.io/managed-by: Helm
spec:
type: LoadBalancer
type: {{ .Values.service.type }}
selector:
com.docker.compose.project: bridge
com.docker.compose.service: serviceA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ metadata:
com.docker.compose.service: serviceB
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
replicas: {{ .Values.deployment.defaultReplicas }}
selector:
matchLabels:
com.docker.compose.project: bridge
com.docker.compose.service: serviceB
strategy:
type: Recreate
type: {{ .Values.deployment.strategy }}
template:
metadata:
labels:
Expand All @@ -29,6 +29,10 @@ spec:
- name: serviceb
image: {{ .Values.serviceB.image }}
imagePullPolicy: {{ .Values.serviceB.imagePullPolicy }}
resources:
limits:
cpu: {{ .Values.resources.defaultCpuLimit }}
memory: {{ .Values.resources.defaultMemoryLimit }}
ports:
- name: serviceb-8082
containerPort: 8082
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
com.docker.compose.service: serviceB
app.kubernetes.io/managed-by: Helm
spec:
type: LoadBalancer
type: {{ .Values.service.type }}
selector:
com.docker.compose.project: bridge
com.docker.compose.service: serviceB
Expand Down
19 changes: 18 additions & 1 deletion pkg/e2e/fixtures/bridge/expected-helm/values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
#! values.yaml
# Project Name
projectName: bridge
# Namespace
namespace: bridge
# Default deployment settings
deployment:
strategy: Recreate
defaultReplicas: 1
# Default resource limits
resources:
defaultCpuLimit: "100m"
defaultMemoryLimit: "512Mi"
# Service settings
service:
type: LoadBalancer
# Storage settings
storage:
defaultStorageClass: "hostpath"
defaultSize: "100Mi"
defaultAccessMode: "ReadWriteOnce"
# Services variables

serviceA:
image: alpine
imagePullPolicy: IfNotPresent
Expand Down