From 1bc85aecedcf13a484e9dd7069530c3abad1f9cf Mon Sep 17 00:00:00 2001 From: mr Date: Mon, 16 Jun 2025 09:19:41 +0200 Subject: [PATCH 1/3] adjust deployment --- Makefile | 11 ++++++++--- env.env | 4 ++++ oc-workflow | Bin 27532660 -> 27532660 bytes 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 env.env diff --git a/Makefile b/Makefile index 90d4b0e..5c846e8 100644 --- a/Makefile +++ b/Makefile @@ -21,15 +21,20 @@ clean: rm -rf oc-workflow.tar.gz docker: - DOCKER_BUILDKIT=1 docker build -t oc/oc-workflow:0.0.1 -f Dockerfile . - docker tag oc/oc-workflow:0.0.1 oc/oc-workflow:latest + DOCKER_BUILDKIT=1 docker build -t oc-workflow -f Dockerfile . --build-arg=HOST=$(HOST) + docker tag oc-workflow:latest oc/oc-workflow:0.0.1 publish-kind: - kind load docker-image oc/oc-workflow:0.0.1 --name opencloud + kind load docker-image oc/oc-workflow:0.0.1 --name opencloud | true publish-registry: @echo "TODO" +docker-deploy: + docker compose up -d + +run-docker: docker publish-kind publish-registry docker-deploy + all: clean docker publish-kind publish-registry .PHONY: build run clean docker publish-kind publish-registry diff --git a/env.env b/env.env new file mode 100644 index 0000000..c0d18f1 --- /dev/null +++ b/env.env @@ -0,0 +1,4 @@ +KUBERNETES_SERVICE_HOST=192.168.47.20 +KUBE_CA="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTVlk3ZHZhNEdYTVdkMy9jMlhLN3JLYjlnWXgyNSthaEE0NmkyNVBkSFAKRktQL2UxSVMyWVF0dzNYZW1TTUQxaStZdzJSaVppNUQrSVZUamNtNHdhcnFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWtlUVJpNFJiODduME5yRnZaWjZHClc2SU55NnN3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnRXA5ck04WmdNclRZSHYxZjNzOW5DZXZZeWVVa3lZUk4KWjUzazdoaytJS1FDSVFDbk05TnVGKzlTakIzNDFacGZ5ays2NEpWdkpSM3BhcmVaejdMd2lhNm9kdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K" +KUBE_CERT="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K" +KUBE_DATA="LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=" diff --git a/oc-workflow b/oc-workflow index 002f82491cec1414b4c9b04953da3b659d008f3c..02ffd210b52aded357f5fb8c23018a6f937e3a3a 100755 GIT binary patch delta 2058 zcmbu+S6dSX0EOWv;zq=Qh`*OWkH!e1N2iVK3CB@06pm?{#9#fQ9ksXwu z6r5#>b0^0HWoG1Aatci5kOX&1dBYWNUmsg+WkyA6VO*v?Kh14&+nq`7(yC7Hnoe&6 zdcXrc(F?uN2Yt~G{o#oL@WMc7I|zd@1ViD2VerLp_+bP_ViZPW48~#{#$y5|ViG1} z3Z`Nj{1JfZ2*eBoVJ3nRf>0P?LKw^lhXq#H5P?WUVHRd%4x$l*xtNDo*b#?#Bp?w< zn2%&Ez(S;85f&pAX-G!~mLL;Lu?$&QjulvmRmjF_IN(GMT*yTp)?h8xAs=q6M*#{^ zgbmn;Vr)VQN>PS#RA4hIu?1VP4coB;JFyG9QH4FI#$ME5ANJz_YH<*Ua2R!{#}OPw z1CF5)$I*mloWMz(!fBkrS+w9BT5%p1a2?ukJ#N5_xCuAo7Tk*4a69h6Mcj$Ia5wJ3 zy|@pTa6cZvWju(7@Gu@hJ08UqJch^d#HCK}s~(O1CWpFpb9pNsM&5~m>8pEBIme!8Z20u@uH9f=r^cn9y|J-m+(@F6}z2R_Cp_!OVvb9{j>@fE(tH|WH-_zvHr z3qRmT{Dhy;jbHF9e#7th1ApQ#{EdI`FaE2wwHfN5^iVvMo=PvJx6()HtMpU)E1t># z#Y-8ecq@aH!O9S2sN$mxQ+$=-ik~t<8L5miwAKFTTHb&#R~Va=lkKE;bwe;{sz+11(Wy=@r%-cY&ka8f|g} z<=T=FiUfCN!xf{CcY409C^;uCIjSrzHY=&r>CT8Rsp>S=bQ%rl z0T1*jWjj|rHFNtlc& zn2KregFmJt05cGXnFxXjW>{cFFl-2c9iea_4B?2tEX>9nL?Q~&h{0UMVjki!9}5tV z1T4fNBw{g^U@4N2j1;6I4e3~h<;cJati&p;MkdxE3r=Js2W#O%F7mJr`6$486vB-n z6r%(iuo0V3iZYa=0-I5ZE!c`}*p408iCx%@D(pcu_M!&+upb9di-S0X!>B_&j^HR7 za14z&jwUqY1Ww`(GYlaRY9|O}H7i;8xs*+i?dj;!fO!yKxWh z#eKMh`|$uS<3T)xhw%v7@hGm~F+7eZE_E8OdNlf(bLmDD?^l_inlUM@ll2=zRCz?q%z9T?r0lrhz$Q9$2Dlquy( zg|bKQT8eOl>99HU-dgX|6RB2F- mDUHf;rAcX4PADgpQ_5-OjB-|KQO+r?%6UV3SH}fIb;LD-O4_dg From c8ea7ded6b58d8316c830dda6a66acb4f60fa182 Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 24 Jun 2025 09:06:46 +0200 Subject: [PATCH 2/3] oclib nats search --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 08053ca..776e264 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 toolchain go1.24.0 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20250429145052-bd194e6d47df + cloud.o-forge.io/core/oc-lib v0.0.0-20250624064953-2c8dcbe93d14 github.com/beego/beego/v2 v2.3.7 github.com/nats-io/nats.go v1.41.2 github.com/smartystreets/goconvey v1.7.2 diff --git a/go.sum b/go.sum index a9df8ec..1f69c32 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7 h1:fh6SzBPenzIxu cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= cloud.o-forge.io/core/oc-lib v0.0.0-20250429145052-bd194e6d47df h1:znmZa6505csTTpqgxrrbNZXGovB1PymvHKhKQPzmY2s= cloud.o-forge.io/core/oc-lib v0.0.0-20250429145052-bd194e6d47df/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624064953-2c8dcbe93d14 h1:iCTrYc2+W2BFLOupRK1sD6sOgsK4NIs6WMC+4LiWCaY= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624064953-2c8dcbe93d14/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.1 h1:7MUKMpJYzOXtCUsTEoXOxsDV/UcHw6CPbaWMlthVNsc= github.com/beego/beego/v2 v2.3.1/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4= From a1b7bd4e9d7bdf07733f63f1d7b44e0bf229a85e Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 24 Jun 2025 17:01:12 +0200 Subject: [PATCH 3/3] oclib --- go.mod | 2 +- go.sum | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 776e264..0096859 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 toolchain go1.24.0 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20250624064953-2c8dcbe93d14 + cloud.o-forge.io/core/oc-lib v0.0.0-20250624102227-e600fedcab06 github.com/beego/beego/v2 v2.3.7 github.com/nats-io/nats.go v1.41.2 github.com/smartystreets/goconvey v1.7.2 diff --git a/go.sum b/go.sum index 1f69c32..08b96f2 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,12 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20250429145052-bd194e6d47df h1:znmZa6505csTT cloud.o-forge.io/core/oc-lib v0.0.0-20250429145052-bd194e6d47df/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= cloud.o-forge.io/core/oc-lib v0.0.0-20250624064953-2c8dcbe93d14 h1:iCTrYc2+W2BFLOupRK1sD6sOgsK4NIs6WMC+4LiWCaY= cloud.o-forge.io/core/oc-lib v0.0.0-20250624064953-2c8dcbe93d14/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624093207-3fdf5c3ebf29 h1:JitS1izRltTyOaWnvXnmYywHj0napsL6y0nBYiWUCNo= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624093207-3fdf5c3ebf29/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624095852-147c7bc3a1d5 h1:0eV0E3kBZkOyoAurRmP9h4eHmFrZajOxSqoBgM3l3dk= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624095852-147c7bc3a1d5/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624102227-e600fedcab06 h1:+RSv62uIC7wsmibsp1XTanQMNznNeOGgPpfhb6ZHT4c= +cloud.o-forge.io/core/oc-lib v0.0.0-20250624102227-e600fedcab06/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.1 h1:7MUKMpJYzOXtCUsTEoXOxsDV/UcHw6CPbaWMlthVNsc= github.com/beego/beego/v2 v2.3.1/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=