Skip to content

Commit

Permalink
Fix env vars from #711 (#824)
Browse files Browse the repository at this point in the history
  • Loading branch information
evankanderson authored and knative-prow-robot committed Feb 20, 2019
1 parent d5a2452 commit 3086593
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 28 deletions.
34 changes: 16 additions & 18 deletions contrib/gcppubsub/config/gcppubsub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,10 @@ spec:
value: gcppubsub-channel-key
- name: DEFAULT_SECRET_KEY
value: key.json
env:
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace

---

Expand Down Expand Up @@ -215,19 +214,18 @@ spec:
- name: dispatcher
image: github.com/knative/eventing/contrib/gcppubsub/pkg/dispatcher/cmd
env:
- name: DEFAULT_GCP_PROJECT
value: REPLACE_WITH_GCP_PROJECT
- name: DEFAULT_SECRET_NAMESPACE
value: knative-eventing
- name: DEFAULT_SECRET_NAME
value: gcppubsub-channel-key
- name: DEFAULT_SECRET_KEY
value: key.json
env:
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: DEFAULT_GCP_PROJECT
value: REPLACE_WITH_GCP_PROJECT
- name: DEFAULT_SECRET_NAMESPACE
value: knative-eventing
- name: DEFAULT_SECRET_NAME
value: gcppubsub-channel-key
- name: DEFAULT_SECRET_KEY
value: key.json
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace

---

Expand Down
20 changes: 10 additions & 10 deletions contrib/natss/config/provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ spec:
containers:
- name: controller
image: github.com/knative/eventing/contrib/natss/pkg/controller
env:
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
env:
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace

---

Expand Down Expand Up @@ -180,8 +180,8 @@ spec:
containers:
- name: dispatcher
image: github.com/knative/eventing/contrib/natss/pkg/dispatcher
env:
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
env:
- name: SYSTEM_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace

0 comments on commit 3086593

Please sign in to comment.