diff --git a/scripts/common.sh b/scripts/common.sh index 0f58766..77829ec 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -28,7 +28,3 @@ function exported_or_fail() { return 0 } - - - - diff --git a/scripts/oc-client.sh b/scripts/oc-client.sh index 1c8fa1e..97b93a0 100644 --- a/scripts/oc-client.sh +++ b/scripts/oc-client.sh @@ -15,10 +15,3 @@ export KUBECONFIG=$(workspaces.kubeconfig_dir.path)/kubeconfig "${params.SCRIPT}" - - - - - - - diff --git a/scripts/oc-common.sh b/scripts/oc-common.sh index 1e5f6e3..5b05d29 100644 --- a/scripts/oc-common.sh +++ b/scripts/oc-common.sh @@ -18,8 +18,3 @@ exported_or_fail \ WORKSPACES_KUBECONFIG_DIR_PATH \ PARAMS_SCRIPT \ PARAMS_VERSION - - - - - diff --git a/templates/task-openshift-client.yaml b/templates/task-openshift-client.yaml index e57def7..f4b66e8 100644 --- a/templates/task-openshift-client.yaml +++ b/templates/task-openshift-client.yaml @@ -54,7 +54,7 @@ spec: {{- include "load_scripts" ( list . "oc-" ) | nindent 4 }} - name: oc - image: {{ .Values.images.openshift-cli }} + image: {{ .Values.images.openshiftCli }} env: - name: HOME value: /tekton/home @@ -66,12 +66,8 @@ spec: volumeMounts: - name: scripts-dir mountPath: /scripts - + volumes: - name: scripts-dir emptyDir: {} - - - - diff --git a/values.yaml b/values.yaml index b51f0e3..b4152e6 100644 --- a/values.yaml +++ b/values.yaml @@ -1,7 +1,7 @@ --- images: bash: registry.access.redhat.com/ubi8-minimal:latest - openshift-cli: registry.redhat.io/openshift3/ose-cli + openshiftCli: registry.redhat.io/openshift3/ose-cli annotations: tekton.dev/pipelines.minVersion: "0.17.0"