Skip to content

Commit

Permalink
Clean up minor things
Browse files Browse the repository at this point in the history
  • Loading branch information
Gchbg committed Jun 4, 2024
1 parent dad8df6 commit cbb4e2f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 32 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Enable auto-merge

on: pull_request_target



jobs:
auto-merge:
name: Enable auto-merge
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
branches:
- main

permissions:
contents: write
pull-requests: write

jobs:
release-drafter:
name: Draft release
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22 AS builder
FROM golang:1.22.3 AS builder
ARG TARGETOS
ARG TARGETARCH

Expand Down
25 changes: 0 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
IMG ?= controller:latest

ifeq (,$(shell go env GOBIN))
GOBIN=$(shell go env GOPATH)/bin
else
GOBIN=$(shell go env GOBIN)
endif

SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

Expand Down Expand Up @@ -70,14 +62,6 @@ checklicense: ## Check that every file has a license header present.
build: generate manifests fmt vet ## Build manager binary.
@go build -o metal cmd/main.go

.PHONY: docker-build
docker-build: ## Build docker image with the manager.
@docker build -t ${IMG} .

.PHONY: docker-push
docker-push: ## Push docker image with the manager.
@docker push ${IMG}

##@ Deployment

.PHONY: install
Expand All @@ -87,12 +71,3 @@ install: manifests ## Install CRDs into the K8s cluster specified in ~/.kube/con
.PHONY: uninstall
uninstall: manifests ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
@go run sigs.k8s.io/kustomize/kustomize/v5 build config/crd | kubectl delete --ignore-not-found=true -f -

.PHONY: deploy
deploy: manifests ## Deploy controller to the K8s cluster specified in ~/.kube/config.
@cd config/manager && go run sigs.k8s.io/kustomize/kustomize/v5 edit set image controller=${IMG}
@go run sigs.k8s.io/kustomize/kustomize/v5 build config/default | kubectl apply -f -

.PHONY: undeploy
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
@go run sigs.k8s.io/kustomize/kustomize/v5 build config/default | kubectl delete --ignore-not-found=true -f -

0 comments on commit cbb4e2f

Please sign in to comment.