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

WIP: Split extensions registration #72

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
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
4 changes: 4 additions & 0 deletions jobs/eirini-persi/spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ properties:
description: "Kubernetes service host. Should be set to the value of KUBERNETES_SERVICE_HOST."
eirini-persi.kube_service_port:
description: "Kubernetes service port. Should be set to the value of KUBERNETES_SERVICE_PORT."
eirini-persi.register_only:
description: "Register the extension to Kubernetes."
eirini-persi.start_only:
description: "Starts the extension without registering it."
9 changes: 8 additions & 1 deletion jobs/eirini-persi/templates/bpm.yml.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
processes:
- name: eirini-persi
executable: /var/vcap/packages/eirini-persi/bin/eirini-persi
args: []
<% if_p('eirini-persi.register_only') do |p| %>
args: ["register"]
<% else %>
args: ["start"]
<% end %>
env:
KUBERNETES_SERVICE_HOST: "<%= p("eirini-persi.kube_service_host") %>"
KUBERNETES_SERVICE_PORT: "<%= p("eirini-persi.kube_service_port") %>"
Expand All @@ -10,6 +14,9 @@ processes:
NAMESPACE: "<%= p("eirini-persi.namespace") %>"
OPERATOR_SERVICE_NAME: "<%= p("eirini-persi.operator_webhook_servicename") %>"
OPERATOR_WEBHOOK_NAMESPACE: "<%= p("eirini-persi.operator_webhook_namespace") %>"
<% if_p('eirini-persi.start_only') do |p| %>
EIRINI_EXTENSION_REGISTER: "False"
<% end %>
<% if properties.opi&.k8s&.host_url.nil? %>
# The ServiceAccount admission controller has to be enabled.
# https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod
Expand Down
4 changes: 4 additions & 0 deletions jobs/eirini-ssh-extension/spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ properties:
description: "Kubernetes service host. Should be set to the value of KUBERNETES_SERVICE_HOST."
eirini-ssh-extension.kube_service_port:
description: "Kubernetes service port. Should be set to the value of KUBERNETES_SERVICE_PORT."
eirini-ssh-extension.register_only:
description: "Register the extension to Kubernetes."
eirini-ssh-extension.start_only:
description: "Starts the extension without registering it."
15 changes: 11 additions & 4 deletions jobs/eirini-ssh-extension/templates/bpm.yml.erb
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
processes:
- name: eirini-ssh-extension
executable: /var/vcap/packages/eirini-ssh-extension/bin/eirini-ssh-extension
args: []
<% if_p('eirini-ssh-extension.register_only') do |p| %>
args: ["register"]
<% else %>
args: ["start"]
<% end %>
env:
KUBERNETES_SERVICE_HOST: "<%= p("eirini-ssh-extension.kube_service_host") %>"
KUBERNETES_SERVICE_PORT: "<%= p("eirini-ssh-extension.kube_service_port") %>"
EIRINI_EXTENSION_HOST: "<%= p("eirini-ssh-extension.operator_webhook_host") %>"
EIRINI_EXTENSION_PORT: "<%= p("eirini-ssh-extension.operator_webhook_port") %>"
EIRINI_EXTENSION_NAMESPACE: "<%= p("eirini-ssh-extension.namespace") %>"
OPERATOR_WEBHOOK_HOST: "<%= p("eirini-ssh-extension.operator_webhook_host") %>"
OPERATOR_WEBHOOK_PORT: "<%= p("eirini-ssh-extension.operator_webhook_port") %>"
NAMESPACE: "<%= p("eirini-ssh-extension.namespace") %>"
OPERATOR_SERVICE_NAME: "<%= p("eirini-ssh-extension.operator_webhook_servicename") %>"
OPERATOR_WEBHOOK_NAMESPACE: "<%= p("eirini-ssh-extension.operator_webhook_namespace") %>"
<% if_p('eirini-ssh-extension.start_only') do |p| %>
EIRINI_EXTENSION_REGISTER: "False"
<% end %>
<% if properties.opi&.k8s&.host_url.nil? %>
# The ServiceAccount admission controller has to be enabled.
# https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod
Expand Down
2 changes: 1 addition & 1 deletion src/github.com/SUSE/eirini-persi
2 changes: 1 addition & 1 deletion src/github.com/SUSE/eirini-ssh