Skip to content

Commit 119ab50

Browse files
authored
First part of the housekeeping work around transfer (#632)
##### SUMMARY This pull request is made against the `main` branch. This branch will become default after merging this PR. - Remove license from file headers, - Remove `.mergify.yml`, - Update main license file, - Change `develop` refs to `main` - Change `ghcr.io` registry - Remove the `$` from the copy-paste scripts. As a result, you can paste it to your terminal without any modification. - Fix dead links: ```bash npm install -g markdown-link-check # remote the CHANGELOG.md file first find . -name \*.md -print0 | xargs -0 -n1 markdown-link-check ``` - Update the `CHANGELOG.md` file.
1 parent 77db4fa commit 119ab50

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+505
-2234
lines changed

.github/workflows/branch-build.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ name: Branch build
33
on:
44
push:
55
branches:
6-
- develop
6+
- main
77

88
env:
99
GO_VERSION: 1.18
1010
HELM_VERSION: v3.9.0
1111
K3D_VERSION: v5.4.3
1212
INTEGRATION_TESTS_TIMEOUT: 10m
1313
IMAGE_REGISTRY: "ghcr.io"
14-
IMAGE_REPOSITORY: "infracloudio/botkube"
15-
TEST_IMAGE_REPOSITORY: "infracloudio/botkube-test"
14+
IMAGE_REPOSITORY: "kubeshop/botkube"
15+
TEST_IMAGE_REPOSITORY: "kubeshop/botkube-test"
1616
IMAGE_TAG: v9.99.9-dev # TODO: Use commit hash tag to make the predictable builds for each commit on branch
1717
HELM_CHART_VERSION: v9.99.9-dev # TODO: Use commit hash tag to make the predictable builds for each commit on branch
1818

@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
registry: ghcr.io
4141
username: ${{ github.actor }}
42-
password: ${{ secrets.GH_TOKEN }}
42+
password: ${{ secrets.GITHUB_TOKEN }}
4343
- name: Install GoReleaser
4444
uses: goreleaser/goreleaser-action@v2
4545
with:
@@ -51,6 +51,7 @@ jobs:
5151
uses: azure/setup-helm@v1
5252
with:
5353
version: ${{ env.HELM_VERSION }}
54+
# TODO: https://github.com/kubeshop/botkube/issues/634
5455
- name: Update and publish helm chart
5556
run: |
5657
cd ..
@@ -108,7 +109,7 @@ jobs:
108109
--set e2eTest.image.repository="${TEST_IMAGE_REPOSITORY}" \
109110
--set e2eTest.image.tag="${IMAGE_TAG}" \
110111
--set e2eTest.slack.testerAppToken="${SLACK_TESTER_APP_TOKEN}" \
111-
--set e2eTest.slack.additionalContextMessage="Branch test - commit SHA: ${GITHUB_SHA} - https://github.com/infracloudio/botkube/commit/${GITHUB_SHA}"
112+
--set e2eTest.slack.additionalContextMessage="Branch test - commit SHA: ${GITHUB_SHA} - https://github.com/kubeshop/botkube/commit/${GITHUB_SHA}"
112113
113114
- name: Run tests
114115
run: "helm test botkube --namespace botkube --timeout=$INTEGRATION_TESTS_TIMEOUT --logs"

.github/workflows/pr-build.yaml

+5-8
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@ on:
44
pull_request_target:
55
types: [ opened, synchronize, reopened ]
66
branches:
7-
- "develop"
7+
- "main"
88
paths-ignore:
99
- 'branding/**'
1010
- 'design/**'
1111
- '.codespell-whitelist'
1212
- '.gitignore'
1313
- '.golangci.yml'
14-
- '.mergify.yml'
1514
- 'botkube-title.jpg'
1615
- 'botkube_arch.jpg'
1716
- 'CHANGELOG.md'
1817
- 'CODE_OF_CONDUCT.md'
1918
- 'comm_config.yaml'
2019
- 'CONTRIBUTING.md'
21-
- 'deploy-all-in-one.yaml'
22-
- 'deploy-all-in-one-tls.yaml'
2320
- 'LICENSE'
2421
- 'README.md'
2522
- 'resource_config.yaml'
@@ -31,8 +28,8 @@ env:
3128
PR_NUMBER: ${{ github.event.pull_request.number }}
3229
INTEGRATION_TESTS_TIMEOUT: 10m
3330
IMAGE_REGISTRY: "ghcr.io"
34-
IMAGE_REPOSITORY: "infracloudio/pr/botkube"
35-
TEST_IMAGE_REPOSITORY: "infracloudio/pr/botkube-test"
31+
IMAGE_REPOSITORY: "kubeshop/pr/botkube"
32+
TEST_IMAGE_REPOSITORY: "kubeshop/pr/botkube-test"
3633
IMAGE_TAG: ${{ github.event.pull_request.number }}-PR
3734
IMAGE_SAVE_LOAD_DIR: /tmp/botkube-images
3835

@@ -159,7 +156,7 @@ jobs:
159156
- name: Install BotKube
160157
env:
161158
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
162-
SLACK_TESTER_APP_TOKEN: ${{ secrets.SLACK_TESTER_APP_TOKEN }}
159+
SLACK_TESTER_APP_TOKEN: ${{ secrets.SLACK_TESTER_APP_TOKEN }}
163160
run: |
164161
helm install botkube --namespace botkube ./helm/botkube --wait --create-namespace \
165162
-f ./helm/botkube/e2e-test-values.yaml \
@@ -171,7 +168,7 @@ jobs:
171168
--set e2eTest.image.repository="${TEST_IMAGE_REPOSITORY}" \
172169
--set e2eTest.image.tag="${IMAGE_TAG}" \
173170
--set e2eTest.slack.testerAppToken="${SLACK_TESTER_APP_TOKEN}" \
174-
--set e2eTest.slack.additionalContextMessage="Pull request: ${PR_NUMBER} - https://github.com/infracloudio/botkube/pull/${PR_NUMBER}"
171+
--set e2eTest.slack.additionalContextMessage="Pull request: ${PR_NUMBER} - https://github.com/kubeshop/botkube/pull/${PR_NUMBER}"
175172
176173
- name: Run tests
177174
run: "helm test botkube --namespace botkube --timeout=$INTEGRATION_TESTS_TIMEOUT --logs"

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ linters-settings:
4343
goimports:
4444
# put imports beginning with prefix after 3rd-party packages;
4545
# it's a comma-separated list of prefixes
46-
local-prefixes: github.com/infracloudio/botkube
46+
local-prefixes: github.com/kubeshop/botkube

.goreleaser.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
project_name: botkube
22
env:
33
- IMAGE_REGISTRY={{ if index .Env "IMAGE_REGISTRY" }}{{ .Env.IMAGE_REGISTRY }}{{ else }}ghcr.io{{ end }}
4-
- IMAGE_REPOSITORY={{ if index .Env "IMAGE_REPOSITORY" }}{{ .Env.IMAGE_REPOSITORY }}{{ else }}infracloudio/botkube{{ end }}
5-
- TEST_IMAGE_REPOSITORY={{ if index .Env "TEST_IMAGE_REPOSITORY" }}{{ .Env.TEST_IMAGE_REPOSITORY }}{{ else }}infracloudio/botkube-test{{ end }}
4+
- IMAGE_REPOSITORY={{ if index .Env "IMAGE_REPOSITORY" }}{{ .Env.IMAGE_REPOSITORY }}{{ else }}kubeshop/botkube{{ end }}
5+
- TEST_IMAGE_REPOSITORY={{ if index .Env "TEST_IMAGE_REPOSITORY" }}{{ .Env.TEST_IMAGE_REPOSITORY }}{{ else }}kubeshop/botkube-test{{ end }}
66
before:
77
hooks:
88
- go mod download

.mergify.yml

-15
This file was deleted.

0 commit comments

Comments
 (0)