Skip to content

Commit

Permalink
Happy new yeargit diff
Browse files Browse the repository at this point in the history
Signed-off-by: kpango <[email protected]>
  • Loading branch information
kpango committed Dec 31, 2020
1 parent ab1ec89 commit 9534d51
Show file tree
Hide file tree
Showing 1,211 changed files with 1,310 additions and 1,262 deletions.
2 changes: 1 addition & 1 deletion .commit_template
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .deepsource.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .fossa.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,9 +14,9 @@
# limitations under the License.
#

REPO ?= vdaas
ORG ?= vdaas
NAME = vald
GOPKG = github.com/$(REPO)/$(NAME)
GOPKG = github.com/$(ORG)/$(NAME)
DATETIME = $(eval DATETIME := $(shell date -u +%Y/%m/%d_%H:%M:%S%z))$(DATETIME)
TAG ?= latest
BASE_IMAGE = $(NAME)-base
Expand All @@ -34,6 +34,7 @@ CI_CONTAINER_IMAGE = $(NAME)-ci-container
DEV_CONTAINER_IMAGE = $(NAME)-dev-container
HELM_OPERATOR_IMAGE = $(NAME)-helm-operator
LOADTEST_IMAGE = $(NAME)-loadtest
MAINTAINER = "$(ORG).org $(NAME) team <$(NAME)@$(ORG).org>"

VERSION := $(eval VALD_VERSION := $(shell cat versions/VALD_VERSION))$(VALD_VERSION)

Expand Down Expand Up @@ -211,6 +212,11 @@ SHELL = bash

include Makefile.d/functions.mk

.PHONY: maintainer
## print maintainer
maintainer:
@echo $(MAINTAINER)

.PHONY: help
## print all available commands
help:
Expand Down Expand Up @@ -252,6 +258,7 @@ clean:
.PHONY: license
## add license to files
license:
MAINTAINER=$(MAINTAINER) \
go run hack/license/gen/main.go ./

.PHONY: init
Expand Down
2 changes: 1 addition & 1 deletion Makefile.d/bench.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion Makefile.d/build.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion Makefile.d/client.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
77 changes: 46 additions & 31 deletions Makefile.d/docker.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -35,225 +35,240 @@ docker/platforms:

.PHONY: docker/name/base
docker/name/base:
@echo "$(REPO)/$(BASE_IMAGE)"
@echo "$(ORG)/$(BASE_IMAGE)"

.PHONY: docker/build/base
## build base image
docker/build/base:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/base/Dockerfile \
-t $(REPO)/$(BASE_IMAGE):$(TAG) . \
-t $(ORG)/$(BASE_IMAGE):$(TAG) . \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg GO_VERSION=$(GO_VERSION)

.PHONY: docker/name/agent-ngt
docker/name/agent-ngt:
@echo "$(REPO)/$(AGENT_IMAGE)"
@echo "$(ORG)/$(AGENT_IMAGE)"

.PHONY: docker/build/agent-ngt
## build agent-ngt image
docker/build/agent-ngt:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/agent/core/ngt/Dockerfile \
-t $(REPO)/$(AGENT_IMAGE):$(TAG) . \
-t $(ORG)/$(AGENT_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/agent-sidecar
docker/name/agent-sidecar:
@echo "$(REPO)/$(AGENT_SIDECAR_IMAGE)"
@echo "$(ORG)/$(AGENT_SIDECAR_IMAGE)"

.PHONY: docker/build/agent-sidecar
## build agent-sidecar image
docker/build/agent-sidecar:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/agent/sidecar/Dockerfile \
-t $(REPO)/$(AGENT_SIDECAR_IMAGE):$(TAG) . \
-t $(ORG)/$(AGENT_SIDECAR_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/discoverer-k8s
docker/name/discoverer-k8s:
@echo "$(REPO)/$(DISCOVERER_IMAGE)"
@echo "$(ORG)/$(DISCOVERER_IMAGE)"

.PHONY: docker/build/discoverer-k8s
## build discoverer-k8s image
docker/build/discoverer-k8s:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/discoverer/k8s/Dockerfile \
-t $(REPO)/$(DISCOVERER_IMAGE):$(TAG) . \
-t $(ORG)/$(DISCOVERER_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/gateway-vald
docker/name/gateway-vald:
@echo "$(REPO)/$(GATEWAY_IMAGE)"
@echo "$(ORG)/$(GATEWAY_IMAGE)"

.PHONY: docker/build/gateway-vald
## build gateway-vald image
docker/build/gateway-vald:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/gateway/vald/Dockerfile \
-t $(REPO)/$(GATEWAY_IMAGE):$(TAG) . \
-t $(ORG)/$(GATEWAY_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/meta-redis
docker/name/meta-redis:
@echo "$(REPO)/$(META_REDIS_IMAGE)"
@echo "$(ORG)/$(META_REDIS_IMAGE)"

.PHONY: docker/build/meta-redis
## build meta-redis image
docker/build/meta-redis:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/meta/redis/Dockerfile \
-t $(REPO)/$(META_REDIS_IMAGE):$(TAG) . \
-t $(ORG)/$(META_REDIS_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/meta-cassandra
docker/name/meta-cassandra:
@echo "$(REPO)/$(META_CASSANDRA_IMAGE)"
@echo "$(ORG)/$(META_CASSANDRA_IMAGE)"

.PHONY: docker/build/meta-cassandra
## build meta-cassandra image
docker/build/meta-cassandra:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/meta/cassandra/Dockerfile \
-t $(REPO)/$(META_CASSANDRA_IMAGE):$(TAG) . \
-t $(ORG)/$(META_CASSANDRA_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/backup-manager-mysql
docker/name/backup-manager-mysql:
@echo "$(REPO)/$(MANAGER_BACKUP_MYSQL_IMAGE)"
@echo "$(ORG)/$(MANAGER_BACKUP_MYSQL_IMAGE)"

.PHONY: docker/build/backup-manager-mysql
## build backup-manager-mysql image
docker/build/backup-manager-mysql:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/manager/backup/mysql/Dockerfile \
-t $(REPO)/$(MANAGER_BACKUP_MYSQL_IMAGE):$(TAG) . \
-t $(ORG)/$(MANAGER_BACKUP_MYSQL_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/backup-manager-cassandra
docker/name/backup-manager-cassandra:
@echo "$(REPO)/$(MANAGER_BACKUP_CASSANDRA_IMAGE)"
@echo "$(ORG)/$(MANAGER_BACKUP_CASSANDRA_IMAGE)"

.PHONY: docker/build/backup-manager-cassandra
## build backup-manager-cassandra image
docker/build/backup-manager-cassandra:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/manager/backup/cassandra/Dockerfile \
-t $(REPO)/$(MANAGER_BACKUP_CASSANDRA_IMAGE):$(TAG) . \
-t $(ORG)/$(MANAGER_BACKUP_CASSANDRA_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/manager-compressor
docker/name/manager-compressor:
@echo "$(REPO)/$(MANAGER_COMPRESSOR_IMAGE)"
@echo "$(ORG)/$(MANAGER_COMPRESSOR_IMAGE)"

.PHONY: docker/build/manager-compressor
## build manager-compressor image
docker/build/manager-compressor:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/manager/compressor/Dockerfile \
-t $(REPO)/$(MANAGER_COMPRESSOR_IMAGE):$(TAG) . \
-t $(ORG)/$(MANAGER_COMPRESSOR_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/manager-index
docker/name/manager-index:
@echo "$(REPO)/$(MANAGER_INDEX_IMAGE)"
@echo "$(ORG)/$(MANAGER_INDEX_IMAGE)"

.PHONY: docker/build/manager-index
## build manager-index image
docker/build/manager-index:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/manager/index/Dockerfile \
-t $(REPO)/$(MANAGER_INDEX_IMAGE):$(TAG) . \
-t $(ORG)/$(MANAGER_INDEX_IMAGE):$(TAG) . \
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \
--build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg UPX_OPTIONS=$(UPX_OPTIONS)

.PHONY: docker/name/ci-container
docker/name/ci-container:
@echo "$(REPO)/$(CI_CONTAINER_IMAGE)"
@echo "$(ORG)/$(CI_CONTAINER_IMAGE)"

.PHONY: docker/build/ci-container
## build ci-container image
docker/build/ci-container:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/ci/base/Dockerfile \
-t $(REPO)/$(CI_CONTAINER_IMAGE):$(TAG) . \
-t $(ORG)/$(CI_CONTAINER_IMAGE):$(TAG) . \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg GO_VERSION=$(GO_VERSION)

.PHONY: docker/name/dev-container
docker/name/dev-container:
@echo "$(REPO)/$(DEV_CONTAINER_IMAGE)"
@echo "$(ORG)/$(DEV_CONTAINER_IMAGE)"

.PHONY: docker/build/dev-container
## build dev-container image
docker/build/dev-container: docker/build/ci-container
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/dev/Dockerfile \
-t $(REPO)/$(DEV_CONTAINER_IMAGE):$(TAG) . \
-t $(ORG)/$(DEV_CONTAINER_IMAGE):$(TAG) . \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg BASE_TAG=$(TAG)

.PHONY: docker/name/operator/helm
docker/name/operator/helm:
@echo "$(REPO)/$(HELM_OPERATOR_IMAGE)"
@echo "$(ORG)/$(HELM_OPERATOR_IMAGE)"

.PHONY: docker/build/operator/helm
## build helm-operator image
docker/build/operator/helm:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/operator/helm/Dockerfile \
-t $(REPO)/$(HELM_OPERATOR_IMAGE):$(TAG) . \
-t $(ORG)/$(HELM_OPERATOR_IMAGE):$(TAG) . \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg OPERATOR_SDK_VERSION=$(OPERATOR_SDK_VERSION)

.PHONY: docker/name/loadtest
docker/name/loadtest:
@echo "$(REPO)/$(LOADTEST_IMAGE)"
@echo "$(ORG)/$(LOADTEST_IMAGE)"

.PHONY: docker/build/loadtest
## build loadtest image
docker/build/loadtest:
$(DOCKER) build \
$(DOCKER_OPTS) \
-f dockers/tools/cli/loadtest/Dockerfile \
-t $(REPO)/$(LOADTEST_IMAGE):$(TAG) . \
-t $(ORG)/$(LOADTEST_IMAGE):$(TAG) . \
--build-arg MAINTAINER=$(MAINTAINER) \
--build-arg GO_VERSION=$(GO_VERSION)
2 changes: 1 addition & 1 deletion Makefile.d/functions.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Vdaas.org Vald team ( kpango, rinx, kmrmt )
# Copyright (C) 2019-2020 vdaas.org vald team <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 9534d51

Please sign in to comment.