Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retry #36

Merged
merged 7 commits into from
Jul 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,9 @@
// language - current active spelling language
"language": "en",
// words - list of words to be always considered correct
"words": [
"camelcase",
"creds",
"kubernetes",
"openid",
"otomi",
"redkubes",
"robotv"
],
"words": ["camelcase", "creds", "kubernetes", "openid", "otomi", "redkubes", "robotv"],
// flagWords - list of words to be always considered incorrect
// This is useful for offensive words and common spelling errors.
// For example "hte" should be "the"
"flagWords": [
"hte"
]
}
"flagWords": ["hte"]
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
"prettier.disableLanguages": ["javascript", "typescript"],
"prettier.enable": true,
"typescript.autoClosingTags": false,
"standard.enable": false,
"standard.enable": false
}
13 changes: 5 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,21 @@ All notable changes to this project will be documented in this file. See [standa

### [0.2.7](https://github.com/redkubes/otomi-tasks/compare/v0.2.6...v0.2.7) (2021-07-05)


### Features

* merge values task for chart ([#35](https://github.com/redkubes/otomi-tasks/issues/35)) ([f28fe87](https://github.com/redkubes/otomi-tasks/commit/f28fe87c5c8215a3796fe3eb7c28d42277897a8f))

- merge values task for chart ([#35](https://github.com/redkubes/otomi-tasks/issues/35)) ([f28fe87](https://github.com/redkubes/otomi-tasks/commit/f28fe87c5c8215a3796fe3eb7c28d42277897a8f))

### Bug Fixes

* creating a robot account for each project and adding imagepullse… ([#34](https://github.com/redkubes/otomi-tasks/issues/34)) ([596152e](https://github.com/redkubes/otomi-tasks/commit/596152e054599bd858f5e1e0ddc7629a48b26966))
* version [ci skip] ([6143dc8](https://github.com/redkubes/otomi-tasks/commit/6143dc8a8eba6f6e6579a880d6136e2a792fec22))
- creating a robot account for each project and adding imagepullse… ([#34](https://github.com/redkubes/otomi-tasks/issues/34)) ([596152e](https://github.com/redkubes/otomi-tasks/commit/596152e054599bd858f5e1e0ddc7629a48b26966))
- version [ci skip](<[6143dc8](https://github.com/redkubes/otomi-tasks/commit/6143dc8a8eba6f6e6579a880d6136e2a792fec22)>)

### [0.2.6](https://github.com/redkubes/otomi-tasks/compare/v0.2.5...v0.2.6) (2021-05-22)


### Features

* Gitea drone ([#33](https://github.com/redkubes/otomi-tasks/issues/33)) ([2b2d2ff](https://github.com/redkubes/otomi-tasks/commit/2b2d2ff8743b58899dd6a88878af4c9b298fd08f))
* Gitea drone task ([#28](https://github.com/redkubes/otomi-tasks/issues/28)) ([0e58f0c](https://github.com/redkubes/otomi-tasks/commit/0e58f0c16671bf16e822b6e22c3e01b25d0a07f9))
- Gitea drone ([#33](https://github.com/redkubes/otomi-tasks/issues/33)) ([2b2d2ff](https://github.com/redkubes/otomi-tasks/commit/2b2d2ff8743b58899dd6a88878af4c9b298fd08f))
- Gitea drone task ([#28](https://github.com/redkubes/otomi-tasks/issues/28)) ([0e58f0c](https://github.com/redkubes/otomi-tasks/commit/0e58f0c16671bf16e822b6e22c3e01b25d0a07f9))

### [0.2.5](https://github.com/redkubes/otomi-tasks/compare/v0.2.4...v0.2.5) (2021-03-12)

Expand Down
2 changes: 1 addition & 1 deletion bin/start-proxies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
k="kubectl"
$k -n team-admin port-forward svc/drone 8081:80 &
$k -n gitea port-forward svc/gitea-http 8082:3000 &
$k -n harbor port-forward svc/harbor-harbor-core 8083:80 &
$k -n harbor port-forward svc/harbor-core 8083:80 &
$k -n keycloak port-forward svc/keycloak-http 8084:80 &
133 changes: 129 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@redkubes/gitea-client-node": "1.1.1",
"@redkubes/harbor-client-node": "^2.2.1",
"@redkubes/keycloak-client-node": "^11.0.0",
"@types/lodash": "^4.14.158",
"async-retry": "^1.3.1",
"aws-sdk": "^2.742.0",
"axios": "^0.21.1",
"bluebird": "^3.7.2",
Expand All @@ -25,19 +25,23 @@
"lodash": "^4.17.21",
"lowdb": "^1.0.0",
"morgan": "^1.10.0",
"node-fetch": "^2.6.1",
"ts-custom-error": "^3.2.0"
},
"description": "Tasks needed by the Otomi Container Platform to glue all the pieces together.",
"devDependencies": {
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@hkdobrev/run-if-changed": "^0.3.1",
"@types/async-retry": "^1.4.2",
"@types/chai": "^4.2.12",
"@types/chai-as-promised": "^7.1.3",
"@types/express": "^4.17.7",
"@types/lodash": "^4.14.158",
"@types/lowdb": "^1.0.9",
"@types/mocha": "^7.0.2",
"@types/node": "^13.13.15",
"@types/node-fetch": "^2.5.11",
"@types/sinon": "^9.0.4",
"@types/sinon-chai": "^3.2.4",
"@typescript-eslint/eslint-plugin": "^2.34.0",
Expand Down
4 changes: 3 additions & 1 deletion src/tasks/drone/drone.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as drone from 'drone-node'
import { doApiCall, handleErrors } from '../../utils'
import { doApiCall, faultTolerantFetch, handleErrors } from '../../utils'
import { cleanEnv, DRONE_URL, DRONE_TOKEN } from '../../validators'
import { orgName, repoName } from '../common'

Expand All @@ -21,6 +21,8 @@ const client = new drone.Client({
const errors: string[] = []

async function main(): Promise<void> {
await faultTolerantFetch(env.DRONE_URL)

// first two steps are not working, and drone discourse mentions only real users being able to do this:
// https://discourse.drone.io/t/not-found-from-machine-user/7073/4?u=morriz

Expand Down
3 changes: 2 additions & 1 deletion src/tasks/gitea/gitea-add-users-to-team.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { OrganizationApi, AdminApi, User, Team } from '@redkubes/gitea-client-node'
import { doApiCall } from '../../utils'
import { doApiCall, faultTolerantFetch } from '../../utils'
import { cleanEnv, GITEA_PASSWORD, GITEA_URL } from '../../validators'
import { orgName, teamNameOwners, username } from '../common'

Expand All @@ -9,6 +9,7 @@ const env = cleanEnv({
})
const errors: string[] = []
export default async function main(): Promise<void> {
await faultTolerantFetch(env.GITEA_URL)
let giteaUrl = env.GITEA_URL
if (giteaUrl.endsWith('/')) {
giteaUrl = giteaUrl.slice(0, -1)
Expand Down
Loading