[ci] fix standalone-installer build (#12237)

Signed-off-by: Denis Romanenko <[email protected]>
Signed-off-by: Nikolay Mitrofanov <[email protected]>
Co-authored-by: Nikolay Mitrofanov <[email protected]>

Author: RomanenkoDenys

.werf/defines/installer.tmpl

@@ -1,14 +1,12 @@
 # render imports for install and install standalone images
 # . is dict with next params
 #   Env - werf env
-#   prefix - target files add prefix
 {{- define "installer_and_installer_standalone_generic_imports" }}
 {{- $context := . -}}
-{{- $prefix := $context.prefix -}}
 
 - image: dhctl
   add: /dhctl/bin/dhctl
-  to: {{ $prefix }}/dhctl
+  to: /dhctl
   before: setup
 - image: dev-prebuild
   add: /deckhouse
@@ -19,11 +17,11 @@
   after: setup
 - image: images-digests
   add: /images_digests.json
-  to: {{ $prefix }}/deckhouse/candi/images_digests.json
+  to: /deckhouse/candi/images_digests.json
   before: setup
 - image: version-map-artifact
   add: /version_map_{{ $context.Env }}.yml
-  to: {{ $prefix }}/deckhouse/candi/version_map.yml
+  to: /deckhouse/candi/version_map.yml
   before: setup
 - image: ssh-static
   add: /ssh/bin
@@ -64,22 +62,20 @@
 #   Env - werf env
 #   TF - TF from werf.yaml
 #   Editions - Editions from werf.yaml
-#   prefix - target files add prefix
 {{- define "installer_and_installer_standalone_terraform_imports" }}
 {{- $context := . -}}
-{{- $prefix := $context.prefix -}}
 
 - image: terraform # from modules/040-terraform-manager/images/terraform-manager-base/werf.inc.yaml
   add: /terraform/terraform
-  to: {{ $prefix }}/bin/terraform
+  to: /bin/terraform
   before: setup
 {{- range $_, $edition := $context.Editions }}
   {{- if $edition.terraformProviders }}
     {{- range $_, $tfProvider := $edition.terraformProviders }}
       {{- $tf := index $context.TF $tfProvider }}
 - image: {{ $tf.artifact }} # from modules/040-terraform-manager/images/terraform-manager-{PROVIDER}/werf.inc.yaml
   add: /{{ $tf.artifactBinary }}
-  to: {{ $prefix }}/plugins/registry.terraform.io/{{ $tf.namespace }}/{{ $tf.type }}/{{ $tf.version }}/linux_amd64/{{ $tf.destinationBinary }}
+  to: /plugins/registry.terraform.io/{{ $tf.namespace }}/{{ $tf.type }}/{{ $tf.version }}/linux_amd64/{{ $tf.destinationBinary }}
   before: setup
     {{- end }}
   {{- end }}
@@ -94,12 +90,10 @@
 # render shell scripts for preparing installer image
 # . is dict with keys:
 #   rootContext - context with .Files
-#   prefix - Files.Get prefix
 #   CI_COMMIT_TAG - CI_COMMIT_TAG env
 {{- define "installer_prepare_with_shell" }}
 {{- $context := . -}}
 {{- $rootContext := $context.rootContext -}}
-{{- $prefix := $context.prefix -}}
 
 shell:
   beforeInstall:
@@ -110,7 +104,7 @@ shell:
   - |
     ln -fs /dhctl /usr/bin/dhctl
     cat <<"EOD" > /etc/inputrc
-    {{- $rootContext.Files.Get (printf "%sdeckhouse-controller/files/inputrc" $prefix) | nindent 4 }}
+    {{- $rootContext.Files.Get "deckhouse-controller/files/inputrc" | nindent 4 }}
     EOD
 
     cat <<"EOD" > /etc/bashrc
@@ -129,7 +123,7 @@ shell:
 
     mkdir -p /etc/vim
     cat <<"EOD" > /etc/vim/vimrc.local
-    {{- $rootContext.Files.Get (printf "%sdeckhouse-controller/files/vimrc.local" $prefix) | nindent 4 }}
+    {{- $rootContext.Files.Get "deckhouse-controller/files/vimrc.local" | nindent 4 }}
     EOD
 
     echo 'eval "$(dhctl --completion-script-bash)"' >> /etc/bashrc

.werf/werf-dev-install-standalone.yaml

@@ -1,16 +1,30 @@
 ---
-image: install-standalone-builder
+image: install-standalone-builder-content
+from: {{ .Images.BASE_SCRATCH }}
 final: false
-from: {{ .Images.BASE_ALPINE }}
 git:
 - add: /
-  to: /image/deckhouse
+  to: /deckhouse
   includePaths:
   - candi
   {{ .Files.Get (printf "tools/build_includes/candi-%s.yaml" .Env) }}
 import:
-{{ include "installer_and_installer_standalone_generic_imports" (dict "Env" $.Env "prefix" "/image") }}
-{{ include "installer_and_installer_standalone_terraform_imports" (dict "Env" $.Env "TF" $.TF "Editions" $.Editions "prefix" "/image") }}
+{{ include "installer_and_installer_standalone_generic_imports" (dict "Env" $.Env) }}
+{{ include "installer_and_installer_standalone_terraform_imports" (dict "Env" $.Env "TF" $.TF "Editions" $.Editions) }}
+---
+image: install-standalone-builder
+final: false
+from: {{ .Images.BASE_ALPINE }}
+import:
+- image: install-standalone-builder-content
+  add: /
+  to: /image
+  before: setup
+  includePaths:
+  - bin
+  - deckhouse
+  - plugins
+  - dhctl
 shell:
   setup:
   {{ include "installer_standalone_setup_script" (dict "CI_COMMIT_TAG" .CI_COMMIT_TAG) | nindent 2 }}

.werf/werf-dev-install.yaml

@@ -8,10 +8,10 @@ git:
   - candi
 {{ .Files.Get (printf "tools/build_includes/candi-%s.yaml" .Env) }}
 import:
-{{ include "installer_and_installer_standalone_generic_imports" (dict "Env" $.Env "prefix" "") }}
-{{ include "installer_and_installer_standalone_terraform_imports" (dict "Env" $.Env "TF" $.TF "Editions" $.Editions "prefix" "") }}
+{{ include "installer_and_installer_standalone_generic_imports" (dict "Env" $.Env) }}
+{{ include "installer_and_installer_standalone_terraform_imports" (dict "Env" $.Env "TF" $.TF "Editions" $.Editions) }}
 {{ include "installer_and_installer_standalone_libraries_and_binaries_imports" . }}
 
 {{ include "installer_docker_properties" . }}
 
-{{ include "installer_prepare_with_shell" (dict "rootContext" . "prefix" "" "CI_COMMIT_TAG" .CI_COMMIT_TAG) }}
+{{ include "installer_prepare_with_shell" (dict "rootContext" . "CI_COMMIT_TAG" .CI_COMMIT_TAG) }}

candi/bashible/bb_package_install.sh.tpl

@@ -29,7 +29,7 @@ export PACKAGES_PROXY_ADDRESSES="{{ .packagesProxy.addresses | join "," }}"
 export PACKAGES_PROXY_TOKEN="{{ .packagesProxy.token }}"
 {{- end }}
 
-{{- if $check_python := .Files.Get "/deckhouse/candi/bashible/check_python.sh.tpl" | default (.Files.Get "candi/bashible/check_python.sh.tpl") -}}
+{{- if $check_python := .Files.Get "deckhouse/candi/bashible/check_python.sh.tpl" | default (.Files.Get "candi/bashible/check_python.sh.tpl") -}}
   {{- tpl ( $check_python ) . | nindent 0 }}
 {{- end }}
 
@@ -91,7 +91,7 @@ bb-package-fetch-blob() {
   local REPOSITORY_PATH="${REPOSITORY_PATH:-}"
   local no_proxy=${PACKAGES_PROXY_ADDRESSES}
   local NO_PROXY=${PACKAGES_PROXY_ADDRESSES}
-  
+
   check_python
 
   cat - <<EOFILE | $python_binary

candi/bashible/bootstrap/01-network-scripts.sh.tpl

@@ -15,7 +15,7 @@
 # limitations under the License.
 */}}
 {{- if and (ne .nodeGroup.nodeType "Static") (.provider )}}
-  {{- if $bootstrap_script_network := $.Files.Get (printf "/deckhouse/candi/cloud-providers/%s/bashible/bootstrap-networks.sh.tpl" .provider) | default ($.Files.Get (printf "candi/cloud-providers/%s/bashible/bootstrap-networks.sh.tpl" .provider) ) }}
+  {{- if $bootstrap_script_network := $.Files.Get (printf "deckhouse/candi/cloud-providers/%s/bashible/bootstrap-networks.sh.tpl" .provider) | default ($.Files.Get (printf "candi/cloud-providers/%s/bashible/bootstrap-networks.sh.tpl" .provider) ) }}
     {{- tpl ($bootstrap_script_network) $ | nindent 0 }}
   {{- end }}
 {{- end }}

candi/bashible/bootstrap/02-base-pkgs.sh.tpl

@@ -24,7 +24,7 @@ set -Eeo pipefail
 # For node-manager render this file include to place, where 'bb_package_install' already included on previous lines.
 */}}
 
-{{- if $bb_package_install := .Files.Get "/deckhouse/candi/bashible/bb_package_install.sh.tpl" -}}
+{{- if $bb_package_install := .Files.Get "deckhouse/candi/bashible/bb_package_install.sh.tpl" -}}
   {{- tpl ( $bb_package_install ) . | nindent 0 }}
 {{- end }}
 

candi/bashible/bootstrap/03-prepare-bashible.sh.tpl

@@ -16,7 +16,7 @@
 */}}
 
 function detect_bundle() {
-  {{- .Files.Get "/deckhouse/candi/bashible/detect_bundle.sh" | nindent 2 }}
+  {{- .Files.Get "deckhouse/candi/bashible/detect_bundle.sh" | nindent 2 }}
 }
 
 function get_bundle() {

dhctl/pkg/template/bundle.go

@@ -178,4 +178,6 @@ func InitGlobalVars(pwd string) {
 	checkPortsScriptPath = candiBashibleDir + "/preflight/check_ports.sh.tpl"
 	checkLocalhostScriptPath = candiBashibleDir + "/preflight/check_localhost.sh.tpl"
 	preflightScriptDirPath = candiBashibleDir + "/preflight/"
+	killReverseTunnelPath = candiBashibleDir + "/preflight/kill_reverse_tunnel.sh.tpl"
+	checkProxyRevTunnelOpenScriptPath = candiBashibleDir + "/preflight/check_reverse_tunnel_open.sh.tpl"
 }