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.

Sign up for GitHub

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

Enable kaniko and update golang to 1.16.2 #85

Merged
merged 1 commit into from
Mar 30, 2021
Merged

Enable kaniko and update golang to 1.16.2 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions .ci/pipeline_definitions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ terraformer:
options:
public_build_logs: true
publish:
oci-builder: 'kaniko'
dockerimages:
terraformer:
registry: 'gcr-readwrite'
Expand Down Expand Up @@ -58,7 +59,7 @@ terraformer:
PROVIDER: slim
steps:
verify:
image: 'eu.gcr.io/gardener-project/3rd/golang:1.15.8'
image: 'golang:1.16.2'
jobs:
head-update:
traits:
Expand All @@ -73,7 +74,7 @@ terraformer:
execute:
- test-e2e.sh
depends:
- publish
- build_oci_image_terraformer
image: 'eu.gcr.io/gardener-project/gardener/testmachinery/testmachinery-run:stable'
traits:
version:
Expand All @@ -88,6 +89,7 @@ terraformer:
slack_cfg_name: 'scp_workspace'
component_descriptor: ~
publish:
oci-builder: 'kaniko'
dockerimages:
terraformer:
tag_as_latest: true
2 changes: 1 addition & 1 deletion .test-defs/pod-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ spec:
ACCESS_KEY_ID_FILE=<(echo $ACCESS_KEY_ID)
SECRET_ACCESS_KEY_FILE=<(echo $SECRET_ACCESS_KEY)
IMAGE_TAG=$IMAGE_TAG
image: eu.gcr.io/gardener-project/3rd/golang:1.15.5
image: golang:1.16.2
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

############# golang-base
FROM eu.gcr.io/gardener-project/3rd/golang:1.15.8 AS golang-base
FROM golang:1.16.2 AS golang-base

############# terraform-base
FROM golang-base AS terraform-base
Expand Down Expand Up @@ -43,7 +43,7 @@ ARG PROVIDER=all
RUN make install PROVIDER=$PROVIDER

############# terraformer
FROM eu.gcr.io/gardener-project/3rd/alpine:3.12.3 AS terraformer
FROM alpine:3.13.2 AS terraformer

# add additional packages that are required by provider plugins
RUN apk add --update tzdata
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ install-requirements:

.PHONY: revendor
revendor:
@GO111MODULE=on go mod vendor
@GO111MODULE=on go mod tidy
go mod vendor
go mod tidy
@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/*
@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/.ci/*
@$(REPO_ROOT)/hack/update-github-templates.sh
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/gardener/terraformer

go 1.15
go 1.16

require (
github.com/aws/aws-sdk-go v1.35.26
Expand Down
Loading