Skip to content

Commit 849edd7

Browse files
authored
CR-18009-update-csdp (#689)
1 parent a33091e commit 849edd7

24 files changed

+602
-155
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.1.43
1+
VERSION=v0.1.44
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")

build/Dockerfile.helper

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18.0-alpine3.15
1+
FROM golang:1.20.3-alpine3.17
22

33
RUN apk -U add --no-cache \
44
bash \
@@ -12,14 +12,15 @@ RUN apk -U add --no-cache \
1212
openssl \
1313
&& update-ca-certificates
1414

15-
ARG GH_VERSION=2.5.2
15+
ARG GH_VERSION=2.27.0
1616
RUN curl -L https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz --output gh.tar.gz \
1717
&& tar -xzf gh.tar.gz \
1818
&& mv gh_${GH_VERSION}_linux_amd64/bin/gh /usr/local/bin \
1919
&& rm gh.tar.gz \
2020
&& rm -rf gh_${GH_VERSION}_linux_amd64
2121

22-
RUN curl -Ls https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.5.3/kustomize_v4.5.3_linux_amd64.tar.gz --output kustomize.tar.gz \
22+
ARG KUSTOMIZE_VERSION=5.0.1
23+
RUN curl -Ls https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --output kustomize.tar.gz \
2324
&& tar -xzf kustomize.tar.gz \
2425
&& mv ./kustomize /usr/bin \
2526
&& rm kustomize.tar.gz

build/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
prepare_env_vars: &deps
2121
stage: Prepare
2222
title: prepare-env
23-
image: quay.io/codefresh/golang-ci-helper:latest
23+
image: quay.io/codefresh/golang-ci-helper:1.20.3
2424
commands:
2525
- cf_export GO111MODULE=on
2626
- cf_export GOCACHE=/codefresh/volume/gocache # change gopath to codefresh shared volume

cmd/commands/common.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,6 @@ func ensureRuntimeName(ctx context.Context, args []string, allowManaged bool) (s
204204
return runtimeName, nil
205205
}
206206

207-
func isRuntimesExist(ctx context.Context) (bool, error) {
208-
runtimes, err := cfConfig.NewClient().V2().Runtime().List(ctx)
209-
if err != nil {
210-
return true, fmt.Errorf("failed to get runtime list: %w", err)
211-
}
212-
return len(runtimes) > 0, nil
213-
}
214-
215207
func getRuntimeNameFromUserSelect(ctx context.Context, allowManaged bool) (string, error) {
216208
runtimes, err := cfConfig.NewClient().V2().Runtime().List(ctx)
217209
if err != nil {
@@ -752,14 +744,6 @@ func suggestIscRepo(ctx context.Context, suggestedSharedConfigRepo string) (stri
752744
return setIscRepoResponse, nil
753745
}
754746

755-
func resetIscRepoUrl(ctx context.Context) error {
756-
err := cfConfig.NewClient().V2().Runtime().ResetSharedConfigRepo(ctx)
757-
if err != nil {
758-
return fmt.Errorf("failed to reset shared config repo. Error: %w", err)
759-
}
760-
return nil
761-
}
762-
763747
func isRuntimeManaged(ctx context.Context, runtimeName string) (bool, error) {
764748
rt, err := getRuntime(ctx, runtimeName)
765749
if err != nil {

0 commit comments

Comments
 (0)