Skip to content

Commit f3351d3

Browse files
authored
Merge pull request #5 from xmudrii/repo-cleanup
Clean up repository and add kcp-relevant configuration
2 parents 1677611 + 2e88e6c commit f3351d3

31 files changed

+78
-106
lines changed

.git-crypt/.gitattributes

Lines changed: 0 additions & 3 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ updates:
66
interval: daily
77
labels:
88
- "area/dependency"
9-
- "release-note-none"
109
- "ok-to-test"
1110
open-pull-requests-limit: 10
1211

@@ -16,6 +15,5 @@ updates:
1615
interval: daily
1716
labels:
1817
- "area/dependency"
19-
- "release-note-none"
2018
- "ok-to-test"
2119
open-pull-requests-limit: 10

.github/workflows/golangci-lint.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- main
87
- master
98

109
jobs:
1110
golangci-lint:
1211
runs-on: ubuntu-latest
1312
steps:
1413
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
15-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
14+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
1615
with:
17-
go-version: '1.22'
18-
check-latest: true
16+
go-version: v1.24.5
1917
- name: golangci-lint
2018
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
2119
with:
22-
version: v2.1
20+
version: v2.5

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ linters:
4949
- musttag
5050
- nakedret
5151
- nilerr
52-
- noctx
52+
# - noctx
5353
- nolintlint
5454
- nosprintfhostport
5555
- prealloc

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ RUN apt-get update \
2323
ENV GOPATH="/go-workspace"
2424
ENV GOROOT="/go-workspace/go"
2525
ENV PATH="${GOPATH}/bin:/go-workspace/go/bin:${PATH}"
26-
ENV GIT_COMMITTER_NAME="Kubernetes Publisher"
27-
ENV GIT_COMMITTER_EMAIL="k8s-publishing-bot@users.noreply.github.com"
26+
ENV GIT_COMMITTER_NAME="kcp CI Bot"
27+
ENV GIT_COMMITTER_EMAIL="kcp-ci-bot@xrstf.de"
2828
ENV TERM=xterm
2929
ENV PS1='\h:\w\$'
3030
ENV SHELL=/bin/bash

Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ all: build
2121
GIT_TAG ?= $(shell git describe --tags --always --dirty)
2222

2323
# Image variables
24-
IMG_REGISTRY ?= gcr.io/k8s-staging-publishing-bot
25-
IMG_NAME = k8s-publishing-bot
24+
IMG_REGISTRY ?= ghcr.io/kcp-dev
25+
IMG_NAME = publishing-bot
2626

2727
IMG_VERSION ?= v0.0.0-2
2828

@@ -37,6 +37,7 @@ CPU_LIMITS ?= 2
3737
CPU_REQUESTS ?= 300m
3838
MEMORY_REQUESTS ?= 200Mi
3939
MEMORY_LIMITS ?= 1639Mi
40+
STORAGE_CLASS ?= ebs-sc
4041
GOOS ?= linux
4142

4243
build_cmd = mkdir -p _output && GOOS=$(GOOS) CGO_ENABLED=0 go build -o _output/$(1) ./cmd/$(1)
@@ -90,11 +91,11 @@ init-deploy: validate
9091
$(KUBECTL) delete -n "$(NAMESPACE)" --ignore-not-found=true replicaset publisher
9192
$(KUBECTL) delete -n "$(NAMESPACE)" --ignore-not-found=true pod publisher
9293
while $(KUBECTL) get pod -n "$(NAMESPACE)" publisher -a &>/dev/null; do echo -n .; sleep 1; done
93-
$(KUBECTL) apply -n "$(NAMESPACE)" -f artifacts/manifests/storage-class.yaml || true
94-
$(KUBECTL) get StorageClass ssd
94+
$(KUBECTL) get StorageClass "$(STORAGE_CLASS)"
9595
$(KUBECTL) apply -n "$(NAMESPACE)" -f $(CONFIG)-configmap.yaml
96-
$(KUBECTL) apply -n "$(NAMESPACE)" -f $(CONFIG)-rules-configmap.yaml; \
97-
$(KUBECTL) apply -n "$(NAMESPACE)" -f artifacts/manifests/pvc.yaml
96+
$(KUBECTL) apply -n "$(NAMESPACE)" -f $(CONFIG)-rules-configmap.yaml
97+
{ cat artifacts/manifests/pvc.yaml && sed 's,SC_NAME,$(STORAGE_CLASS),g' artifacts/manifests/pvc.yaml; } | \
98+
$(KUBECTL) apply -f -
9899
.PHONY: init-deploy
99100

100101
run: init-deploy

0 commit comments

Comments
 (0)