Skip to content

Commit

Permalink
fix: update go and npm deps (#101)
Browse files Browse the repository at this point in the history
* fix: update go and npm deps

* fix: update k8s stuff to 1.17.4
  • Loading branch information
givanov authored Apr 13, 2020
1 parent 951cfe8 commit 648f971
Show file tree
Hide file tree
Showing 7 changed files with 2,252 additions and 2,312 deletions.
4 changes: 2 additions & 2 deletions .prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ presubmits:
containers:
- name: "test"
imagePullPolicy: IfNotPresent
image: quay.io/ouzi/go-builder:1.14.0
image: quay.io/ouzi/go-builder:1.14.2
command:
- make
args:
Expand All @@ -28,7 +28,7 @@ presubmits:
containers:
- name: "lint"
imagePullPolicy: IfNotPresent
image: quay.io/ouzi/go-builder:1.14.0
image: quay.io/ouzi/go-builder:1.14.2
command:
- make
args:
Expand Down
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ HAS_GO_IMPORTS := $(shell command -v goimports;)
HAS_GO_MOCKGEN := $(shell command -v mockgen;)
HAS_GOLANGCI_LINT := $(shell command -v golangci-lint;)

GOLANGCI_LINT_VERSION := v1.23.1
GOLANGCI_LINT_VERSION := v1.24.0
GOLANGCI_VERSION_CHECK := $(shell golangci-lint --version | grep -oh $(GOLANGCI_LINT_VERSION);)

DOCKER_REPO := quay.io/ouzi/credstash-operator
Expand Down Expand Up @@ -220,4 +220,13 @@ ifneq ("$(wildcard $(GCLOUD_KEY_FILE))","")
gcloud auth activate-service-account --key-file=$(GCLOUD_KEY_FILE)
else
@echo $(GCLOUD_KEY_FILE) not present
endif
endif

.PHONY: install-npm-check-updates
install-npm-check-updates:
npm install npm-check-updates

.PHONY: update-npm-dependencies
update-npm-dependencies: install-npm-check-updates
ncu -u
npm install
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/ouzi/go-builder:1.14.0 as builder
FROM quay.io/ouzi/go-builder:1.14.2 as builder

WORKDIR /credstash-operator

Expand Down
56 changes: 28 additions & 28 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,44 @@ go 1.14

require (
github.com/apex/log v1.1.1 // indirect
github.com/aws/aws-sdk-go v1.29.20
github.com/golang/mock v1.4.1
github.com/aws/aws-sdk-go v1.30.7
github.com/golang/mock v1.4.3
github.com/olekukonko/tablewriter v0.0.4 // indirect
github.com/operator-framework/operator-sdk v0.15.2
github.com/operator-framework/operator-sdk v0.16.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.5.1
github.com/versent/unicreds v1.5.1-0.20180327234242-7135c859e003
k8s.io/api v0.17.3
k8s.io/apimachinery v0.17.3
k8s.io/api v0.17.4
k8s.io/apimachinery v0.17.4
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
sigs.k8s.io/controller-runtime v0.5.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
sigs.k8s.io/controller-runtime v0.5.2
)

// Pinned to kubernetes-1.17.0
replace (
github.com/openshift/api => github.com/openshift/api v0.0.0-20200117162508-e7ccdda6ba67
k8s.io/api => k8s.io/api v0.17.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.3
k8s.io/apimachinery => k8s.io/apimachinery v0.17.3
k8s.io/apiserver => k8s.io/apiserver v0.17.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.3
k8s.io/client-go => k8s.io/client-go v0.17.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.3
k8s.io/code-generator => k8s.io/code-generator v0.17.3
k8s.io/component-base => k8s.io/component-base v0.17.3
k8s.io/cri-api => k8s.io/cri-api v0.17.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.3
k8s.io/kubectl => k8s.io/kubectl v0.17.3
k8s.io/kubelet => k8s.io/kubelet v0.17.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.3
k8s.io/metrics => k8s.io/metrics v0.17.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.3
k8s.io/api => k8s.io/api v0.17.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.4
k8s.io/apimachinery => k8s.io/apimachinery v0.17.4
k8s.io/apiserver => k8s.io/apiserver v0.17.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.4
k8s.io/client-go => k8s.io/client-go v0.17.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.4
k8s.io/code-generator => k8s.io/code-generator v0.17.4
k8s.io/component-base => k8s.io/component-base v0.17.4
k8s.io/cri-api => k8s.io/cri-api v0.17.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.4
k8s.io/kubectl => k8s.io/kubectl v0.17.4
k8s.io/kubelet => k8s.io/kubelet v0.17.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.4
k8s.io/metrics => k8s.io/metrics v0.17.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.4
k8s.io/utils => k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
)

Expand Down
Loading

0 comments on commit 648f971

Please sign in to comment.