Skip to content

Commit

Permalink
Update docker build to go 1.19
Browse files Browse the repository at this point in the history
Signed-off-by: Todd Ekenstam <Todd_Ekenstam@intuit.com>
  • Loading branch information
tekenstam committed Sep 20, 2023
1 parent 593f361 commit 5682fd0
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.17 as builder
FROM --platform=$BUILDPLATFORM golang:1.19 as builder
ARG TARGETOS TARGETARCH
WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ GO_LDFLAGS ?= -ldflags="-s -w"
IMG ?= instance-manager:latest
INSTANCEMGR_TAG ?= latest

# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true"

.PHONY: all
all: check-go test clean manager

Expand Down Expand Up @@ -82,7 +79,7 @@ deploy: manifests
# Generate manifests e.g. CRD, RBAC etc.
.PHONY: manifests
manifests: controller-gen
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=instance-manager webhook paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases
$(CONTROLLER_GEN) rbac:roleName=instance-manager crd webhook paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases

# Run go fmt against code
.PHONY: fmt
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/instancegroup_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ func TestScalingConfigOverride(t *testing.T) {
err := testFunction(t, tt.args)
if (!tt.expectedError && err != "") || (tt.expectedError && err == "") {
t.Errorf("%v: got: %v, expectedError: %v", tt.name, err, tt.expectedError)
}
}
got := tt.args.instancegroup.Spec.EKSSpec.Type
if got != tt.want {
t.Errorf("%v: got %v, want %v", tt.name, got, tt.want)
Expand Down
10 changes: 1 addition & 9 deletions config/crd/bases/instancemgr.keikoproj.io_instancegroups.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.1
name: instancegroups.instancemgr.keikoproj.io
spec:
group: instancemgr.keikoproj.io
Expand Down Expand Up @@ -480,9 +478,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
2 changes: 0 additions & 2 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: instance-manager
rules:
- apiGroups:
Expand Down
Loading

0 comments on commit 5682fd0

Please sign in to comment.