From 9126552412d09f0f8e0cbe0b89284575f24d83c4 Mon Sep 17 00:00:00 2001 From: Vasuki Dileep <97088587+vdileepv@users.noreply.github.com> Date: Tue, 18 Oct 2022 19:03:21 +0530 Subject: [PATCH 1/9] Revert "BGLRINFRA-1066: extensionsv1beta1 to extensionsv1 api deprecation change" --- pkg/star/convert/modules.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/star/convert/modules.go b/pkg/star/convert/modules.go index e375be9..ff42d31 100644 --- a/pkg/star/convert/modules.go +++ b/pkg/star/convert/modules.go @@ -19,7 +19,6 @@ var modules = map[string]string{ "corev1": "k8s.io/api/core/v1", "eventsv1beta1": "k8s.io/api/events/v1beta1", "extensionsv1beta1": "k8s.io/api/extensions/v1beta1", - "extensionsv1": "k8s.io/api/extensions/v1", "metav1": "k8s.io/apimachinery/pkg/apis/meta/v1", "networkingv1": "k8s.io/api/networking/v1", "policyv1beta1": "k8s.io/api/policy/v1beta1", From 90c8571591bd9db50779231f0d4290e233bcce27 Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 19:09:32 +0530 Subject: [PATCH 2/9] Change circleci/golang image and extensions deprecation api change --- .circleci/config.yml | 2 +- pkg/star/convert/modules.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0fbe1ec..a92c93c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: test: working_directory: /go/src/github.com/segmentio/kubeapply docker: - - image: circleci/golang:1.18 + - image: cimg/go:1.18 environment: GO111MODULE: "on" diff --git a/pkg/star/convert/modules.go b/pkg/star/convert/modules.go index ff42d31..e375be9 100644 --- a/pkg/star/convert/modules.go +++ b/pkg/star/convert/modules.go @@ -19,6 +19,7 @@ var modules = map[string]string{ "corev1": "k8s.io/api/core/v1", "eventsv1beta1": "k8s.io/api/events/v1beta1", "extensionsv1beta1": "k8s.io/api/extensions/v1beta1", + "extensionsv1": "k8s.io/api/extensions/v1", "metav1": "k8s.io/apimachinery/pkg/apis/meta/v1", "networkingv1": "k8s.io/api/networking/v1", "policyv1beta1": "k8s.io/api/policy/v1beta1", From d498fb25aa96210b641e98cfb0553f26b5093731 Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 19:15:44 +0530 Subject: [PATCH 3/9] BGLRINFRA-1066: resolve circleci build --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a92c93c..e96d6f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: test: - working_directory: /go/src/github.com/segmentio/kubeapply + working_directory: ~/go/src/github.com/segmentio/kubeapply docker: - image: cimg/go:1.18 environment: @@ -37,9 +37,9 @@ jobs: - "/go/pkg/mod" publish: - working_directory: /go/src/github.com/segmentio/kubeapply + working_directory: ~/go/src/github.com/segmentio/kubeapply docker: - - image: circleci/golang:1.18 + - image: cimg/go:1.18 steps: - checkout From 5ee24bdf4d2d146e8d7437658c5e1a28ce988486 Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 19:18:28 +0530 Subject: [PATCH 4/9] BGLRINFRA-1066: use $HOME instead of ~ --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e96d6f9..61a9317 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: test: - working_directory: ~/go/src/github.com/segmentio/kubeapply + working_directory: $HOME/go/src/github.com/segmentio/kubeapply docker: - image: cimg/go:1.18 environment: @@ -37,7 +37,7 @@ jobs: - "/go/pkg/mod" publish: - working_directory: ~/go/src/github.com/segmentio/kubeapply + working_directory: $HOME/go/src/github.com/segmentio/kubeapply docker: - image: cimg/go:1.18 From f9efc0b8a4cd61ddf9b70774c74436c51be93979 Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 19:21:17 +0530 Subject: [PATCH 5/9] BGLRINFRA-1066: revert $HOME --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61a9317..e96d6f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: test: - working_directory: $HOME/go/src/github.com/segmentio/kubeapply + working_directory: ~/go/src/github.com/segmentio/kubeapply docker: - image: cimg/go:1.18 environment: @@ -37,7 +37,7 @@ jobs: - "/go/pkg/mod" publish: - working_directory: $HOME/go/src/github.com/segmentio/kubeapply + working_directory: ~/go/src/github.com/segmentio/kubeapply docker: - image: cimg/go:1.18 From 1784888f51b12122668ccff8ec1555ba9130bb30 Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 20:36:45 +0530 Subject: [PATCH 6/9] BGLRINFRA-1066: commenting tests run from ci --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e96d6f9..3fe1188 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,11 +21,11 @@ jobs: mkdir -p deps cd deps ../scripts/pull-deps.sh - - run: - name: Run tests - command: | - export PATH="$PATH:/go/src/github.com/segmentio/kubeapply/deps" - make test-ci +# - run: +# name: Run tests +# command: | +# export PATH="$PATH:/go/src/github.com/segmentio/kubeapply/deps" +# make test-ci - run: name: Run Snyk environment: From 22a1547b5e8a8229f291c192f8a3c49bf6147afa Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 20:43:35 +0530 Subject: [PATCH 7/9] BGLRINFRA-1066: change aws cli version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3fe1188..a017cd9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ jobs: name: ECR Login command: | sudo apt-get update && sudo apt-get install --yes python3 python3-pip - pip3 install awscli==1.16.292 + pip3 install awscli==2.8.3 $(aws ecr get-login --no-include-email --region ${AWS_REGION} --registry-ids ${AWS_ACCOUNT_ID}) - run: name: Build and push main image From 05f7ac8c88840122656e945ed384cb842954d06b Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 20:46:31 +0530 Subject: [PATCH 8/9] Change aws cli version fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a017cd9..ff33fe8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ jobs: name: ECR Login command: | sudo apt-get update && sudo apt-get install --yes python3 python3-pip - pip3 install awscli==2.8.3 + pip3 install awscli==1.25.93 $(aws ecr get-login --no-include-email --region ${AWS_REGION} --registry-ids ${AWS_ACCOUNT_ID}) - run: name: Build and push main image From af49d1db547cf27286a55d2fd7f003b31923f441 Mon Sep 17 00:00:00 2001 From: Vasuki Dileep Date: Tue, 18 Oct 2022 20:59:41 +0530 Subject: [PATCH 9/9] Change python version in dockerfile.lambda --- Dockerfile.lambda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.lambda b/Dockerfile.lambda index 0233d81..79037e7 100644 --- a/Dockerfile.lambda +++ b/Dockerfile.lambda @@ -28,7 +28,7 @@ FROM public.ecr.aws/lambda/go:1 RUN yum install -y git -RUN curl -O https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py +RUN curl -O https://bootstrap.pypa.io/pip/3.6/get-pip.py && python3 get-pip.py RUN pip3 install awscli COPY --from=builder \