Fix make install

This commit is contained in:
Martin Šalata
2022-06-06 13:13:56 +02:00
parent 8f3e13a2c4
commit 3f865bb2fc
7 changed files with 17 additions and 22 deletions

View File

@@ -1,7 +1,6 @@
---
name: Bug Report
about: Report a bug encountered while working with this Gardener extension
labels: kind/bug
---
@@ -14,13 +13,11 @@ If multiple identifiers make sense you can also state the commands multiple time
/area auto-scaling
...
"/area" identifiers: audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|operations|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
"/area" identifiers: audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
"/kind" identifiers: api-change|bug|cleanup|discussion|enhancement|epic|impediment|poc|post-mortem|question|regression|task|technical-debt|test
"/priority" identifiers: normal|critical|blocker
-->
/area TODO
/kind bug
/priority normal
**What happened**:

View File

@@ -1,7 +1,6 @@
---
name: Enhancement Request
about: Suggest an enhancement for this extension
labels: kind/enhancement
---
@@ -14,13 +13,11 @@ If multiple identifiers make sense you can also state the commands multiple time
/area auto-scaling
...
"/area" identifiers: audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|operations|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
"/area" identifiers: audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
"/kind" identifiers: api-change|bug|cleanup|discussion|enhancement|epic|impediment|poc|post-mortem|question|regression|task|technical-debt|test
"/priority" identifiers: normal|critical|blocker
-->
/area TODO
/kind enhancement
/priority normal
**What would you like to be added**:

View File

@@ -2,7 +2,6 @@
name: Flaking Test
about: Report flaky tests or jobs in Gardener CI
title: "[Flaky Test] FLAKING TEST/SUITE"
labels: kind/flake
---
@@ -17,13 +16,11 @@ If multiple identifiers make sense you can also state the commands multiple time
/area auto-scaling
...
"/area" identifiers: audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|operations|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
"/area" identifiers: audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
"/kind" identifiers: api-change|bug|cleanup|discussion|enhancement|epic|impediment|poc|post-mortem|question|regression|task|technical-debt|test
"/priority" identifiers: normal|critical|blocker
-->
/area testing
/kind flake
/priority normal
**Which test(s)/suite(s) are flaking**:

View File

@@ -1,7 +1,6 @@
---
name: Support Request
about: Support request or question relating to this extension
labels: kind/question
---
@@ -10,5 +9,5 @@ STOP -- PLEASE READ!
GitHub is not the right place for support requests.
If you're looking for help, please post your question on the [Kubernetes Slack](http://slack.k8s.io/) ([#gardener](https://kubernetes.slack.com/messages/gardener) channel) or join our [weekly meetings](https://github.com/gardener/documentation/blob/master/CONTRIBUTING.md#weekly-meeting).
If you're looking for help, please post your question on the [Kubernetes Slack](http://slack.k8s.io/) ([#gardener](https://kubernetes.slack.com/messages/gardener) channel) or join our [bi-weekly meetings](https://gardener.cloud/docs/contribute/#bi-weekly-meetings).
-->

View File

@@ -9,13 +9,11 @@ If multiple identifiers make sense you can also state the commands multiple time
"/area" identifiers: audit-logging|auto-scaling|backup|certification|control-plane-migration|control-plane|cost|delivery|dev-productivity|disaster-recovery|documentation|high-availability|logging|metering|monitoring|networking|open-source|ops-productivity|os|performance|quality|robustness|scalability|security|storage|testing|usability|user-management
"/kind" identifiers: api-change|bug|cleanup|discussion|enhancement|epic|impediment|poc|post-mortem|question|regression|task|technical-debt|test
"/priority" identifiers: normal|critical|blocker
For Gardener Enhancement Proposals (GEPs), please check the following [documentation](https://github.com/gardener/gardener/tree/master/docs/proposals/README.md) before submitting this pull request.
-->
/area TODO
/kind TODO
/priority normal
**What this PR does / why we need it**:

View File

@@ -1,9 +1,9 @@
############# builder
FROM golang:1.17.10 AS builder
WORKDIR /go/src/github.com/gardener/gardener-extension-shoot-fleet-agent
WORKDIR /go/src/github.com/ysoftdevs/gardener-extension-shoot-fleet-agent
COPY . .
RUN make install
RUN make vendor install
############# gardener-extension-shoot-fleet-agent
FROM alpine:3.15.4 AS gardener-extension-shoot-fleet-agent

View File

@@ -19,7 +19,7 @@ IMAGE_PREFIX := $(REGISTRY)/gardener-extension
REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
HACK_DIR := $(REPO_ROOT)/hack
VERSION := $(shell cat "$(REPO_ROOT)/VERSION")
LD_FLAGS := "-w -X github.com/javamachr/$(EXTENSION_PREFIX)-$(NAME)/pkg/version.Version=$(IMAGE_TAG)"
LD_FLAGS := "-w -X github.com/ysoftdevs/$(EXTENSION_PREFIX)-$(NAME)/pkg/version.Version=$(IMAGE_TAG)"
LEADER_ELECTION := false
IGNORE_OPERATION_ANNOTATION := true
@@ -44,7 +44,7 @@ start:
.PHONY: install
install:
@LD_FLAGS="-w -X github.com/gardener/$(EXTENSION_PREFIX)-$(NAME)/pkg/version.Version=$(VERSION)" \
@LD_FLAGS="-w -X github.com/ysoftdevs/$(EXTENSION_PREFIX)-$(NAME)/pkg/version.Version=$(VERSION)" \
$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/install.sh ./...
.PHONY: docker-login
@@ -69,8 +69,8 @@ containerd-login:
.PHONY: containerd-images
containerd-images:
@nerdctl build -t $(IMAGE_PREFIX)-$(NAME):$(VERSION) -f Dockerfile -m 6g --target $(EXTENSION_PREFIX)-$(NAME) .
@nerdctl build -t $(IMAGE_PREFIX)-$(NAME):latest -f Dockerfile -m 6g --target $(EXTENSION_PREFIX)-$(NAME) .
@nerdctl build -t $(IMAGE_PREFIX)-$(NAME):$(VERSION) -f Dockerfile --target $(EXTENSION_PREFIX)-$(NAME) .
@nerdctl build -t $(IMAGE_PREFIX)-$(NAME):latest -f Dockerfile --target $(EXTENSION_PREFIX)-$(NAME) .
.PHONY: containerd-push
containerd-push:
@@ -88,6 +88,13 @@ install-requirements:
@go install -mod=vendor $(REPO_ROOT)/vendor/github.com/onsi/ginkgo/ginkgo
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/install-requirements.sh
.PHONY: vendor
vendor:
@GO111MODULE=on go mod vendor
@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
.PHONY: revendor
revendor:
@GO111MODULE=on go mod vendor