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.

Sign up for GitHub

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

Jump to bottom

fix: conflicts #53

Merged
merged 406 commits into from
Oct 31, 2023
Merged

fix: conflicts #53

merged 406 commits into from
Oct 31, 2023

Conversation

ypoplavs
Copy link
Collaborator

Checklist:

  • Any new values are backwards compatible and/or have sensible default.
  • I have signed off all my commits as required by DCO.
  • My CI is green.

argocd-image-updater and others added 30 commits September 21, 2023 18:32
build: automatic update of edge-testkube-cloud-api
1434cc7 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-5a00bac' to '1.4.0-dev-b0e4838'
build: automatic update of edge-testkube-cloud-api
ebcc8f0 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-b0e4838' to '1.4.0-dev-37cab6f'
build: automatic update of norauto-testkube-cloud-api
d1e8b1c 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-b0e4838' to '1.4.0-dev-37cab6f'
updating chart testkube-cloud-api version to 1.15.19 and appVersion t…
c90551a 
…o v1.4.0-dev-37cab6f; Updating testkube-enterprise chart version to 1.12.38.
build: automatic update of norauto-testkube-cloud-api
42c294c 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-37cab6f' to '1.4.0-dev-65b3ea7'
build: automatic update of edge-testkube-cloud-api
b9d55cf 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-37cab6f' to '1.4.0-dev-65b3ea7'
build: automatic update of edge-testkube-cloud-api
aca9892 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-65b3ea7' to '1.4.0-dev-b15deaa'
build: automatic update of norauto-testkube-cloud-api
6b0d877 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-65b3ea7' to '1.4.0-dev-b15deaa'
build: automatic update of edge-testkube-cloud-ui
dd44a91 
updates image kubeshop/testkube-cloud-ui tag '1.4.0-dev-3b91578' to '1.4.0-dev-1b62f33'
updating chart testkube-cloud-ui version to 1.15.20 and appVersion to…
daa8d7c 
… v1.4.0-dev-1b62f33; Updating testkube-enterprise chart version to 1.12.38.
updating chart testkube-cloud-api version to 1.15.21 and appVersion t…
1ee2995 
…o v1.4.0-dev-320a553; Updating testkube-enterprise chart version to 1.12.38.
build: automatic update of norauto-testkube-cloud-api
c5cccc3 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-b15deaa' to '1.4.0-dev-320a553'
build: automatic update of edge-testkube-cloud-api
d767338 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-b15deaa' to '1.4.0-dev-320a553'
build: automatic update of norauto-testkube-cloud-api
20bfeb4 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-320a553' to '1.4.0-dev-daf4000'
build: automatic update of edge-testkube-cloud-api
1e979f1 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-320a553' to '1.4.0-dev-daf4000'
updating chart testkube-cloud-api version to 1.15.22 and appVersion t…
05ff9b4 
…o v1.4.0-dev-0bd1f1d; Updating testkube-enterprise chart version to 1.12.38.
build: automatic update of edge-testkube-cloud-api
4483c58 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-daf4000' to '1.4.0-dev-0bd1f1d'
build: automatic update of norauto-testkube-cloud-api
de8cbcc 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-daf4000' to '1.4.0-dev-0bd1f1d'
build: automatic update of edge-testkube-cloud-ui
71d7c0b 
updates image kubeshop/testkube-cloud-ui tag '1.4.0-dev-1b62f33' to '1.4.0-dev-f46e4e9'
updating chart testkube-cloud-ui version to 1.15.23 and appVersion to…
e482e23 
… v1.4.0-dev-f46e4e9; Updating testkube-enterprise chart version to 1.12.38.
build: automatic update of edge-testkube-cloud-ui
3f55609 
updates image kubeshop/testkube-cloud-ui tag '1.4.0-dev-f46e4e9' to '1.4.0-dev-f6ba2e3'
updating chart testkube-cloud-ui version to 1.15.24 and appVersion to…
fde5ce6 
… v1.4.0-dev-f6ba2e3; Updating testkube-enterprise chart version to 1.12.38.
updating chart testkube-cloud-api version to 1.15.25 and appVersion t…
f5b6369 
…o v1.4.0-dev-d7e44a5; Updating testkube-enterprise chart version to 1.12.38.
build: automatic update of edge-testkube-cloud-api
9153108 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-0bd1f1d' to '1.4.0-dev-d7e44a5'
build: automatic update of norauto-testkube-cloud-api
58680bd 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-0bd1f1d' to '1.4.0-dev-d7e44a5'
build: automatic update of edge-testkube-cloud-ui
68cc89b 
updates image kubeshop/testkube-cloud-ui tag '1.4.0-dev-f6ba2e3' to '1.4.0-dev-bd51171'
updating chart testkube-cloud-ui version to 1.15.26 and appVersion to…
4abbd82 
… v1.4.0-dev-bd51171; Updating testkube-enterprise chart version to 1.12.38.
build: automatic update of norauto-testkube-cloud-api
bc11392 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-d7e44a5' to '1.4.0-dev-fd38a01'
build: automatic update of edge-testkube-cloud-api
cac9878 
updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-d7e44a5' to '1.4.0-dev-fd38a01'
build: automatic update of edge-testkube-cloud-ui
c7ef79c 
updates image kubeshop/testkube-cloud-ui tag '1.4.0-dev-bd51171' to '1.4.0-dev-31e0ca5'
ypoplavs and others added 20 commits October 18, 2023 21:48
@ypoplavs
ci: modify flow (#49)
1f1f6e9 
re-work CI
build: automatic update of edge-testkube-cloud-api
ebdcef8 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-a90b234' to '1.6.0-dev-63ab76d'
build: automatic update of norauto-testkube-cloud-api
2543e1a 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-a90b234' to '1.6.0-dev-63ab76d'
build: automatic update of edge-testkube-cloud-api
f136cd1 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-63ab76d' to '1.6.0-dev-88c8bb9'
build: automatic update of norauto-testkube-cloud-api
d198480 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-63ab76d' to '1.6.0-dev-88c8bb9'
build: automatic update of norauto-testkube-cloud-api
0393520 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-88c8bb9' to '1.6.0-dev-f8b1362'
build: automatic update of edge-testkube-cloud-api
7c4f768 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-88c8bb9' to '1.6.0-dev-f8b1362'
build: automatic update of norauto-testkube-cloud-api
d7ef7a9 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-f8b1362' to '1.6.0-dev-e9d6886'
build: automatic update of edge-testkube-cloud-api
89329d4 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-f8b1362' to '1.6.0-dev-e9d6886'
build: automatic update of edge-testkube-cloud-api
f79e498 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-e9d6886' to '1.6.0-dev-4e419a1'
build: automatic update of norauto-testkube-cloud-api
977b2c5 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-e9d6886' to '1.6.0-dev-4e419a1'
build: automatic update of edge-testkube-cloud-api
cc2ae15 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-4e419a1' to '1.6.0-dev-7aca5c6'
build: automatic update of norauto-testkube-cloud-api
e7a9b3b 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-4e419a1' to '1.6.0-dev-7aca5c6'
build: automatic update of edge-testkube-cloud-api
e73e296 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-7aca5c6' to '1.6.0-dev-73c96d6'
build: automatic update of edge-testkube-cloud-api
b4ca115 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-73c96d6' to '1.6.0-dev-1539bfe'
build: automatic update of edge-testkube-cloud-api
8bb4f64 
updates image kubeshop/testkube-cloud-api tag '1.6.0-dev-1539bfe' to '1.6.0-dev-9ae604f'
build: automatic update of edge-testkube-cloud-ui
13a0890 
updates image kubeshop/testkube-cloud-ui tag '1.6.0-dev-95e04bb' to '1.6.0-dev-d4e8a30'
build: automatic update of edge-testkube-cloud-ui
86eb946 
updates image kubeshop/testkube-cloud-ui tag '1.6.0-dev-d4e8a30' to '1.6.0-dev-cbdb785'
@ypoplavs
resolve conflicts
b72c6e8
Updating helm-chart versions and README files
188361b
@ypoplavs ypoplavs changed the title Fix conflicts fix: conflicts Oct 30, 2023
@ypoplavs ypoplavs requested a review from dejanzele October 31, 2023 08:50
@ypoplavs ypoplavs merged commit eaf49cd into main Oct 31, 2023
4 checks passed
@ypoplavs ypoplavs deleted the fix-conflicts branch November 15, 2023 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dejanzele dejanzele dejanzele approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ypoplavs @dejanzele @rangoo94