From 930b78dae103e2af1fa59a341aac47ce4076a3e9 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Thu, 8 Feb 2024 11:03:15 +0100 Subject: [PATCH] fixing stopping container issues --- hack/provider/provider.yaml | 20 +++---- ...rovider-debug.yaml => provider.yaml.debug} | 56 ++++++++----------- pkg/options/options.go | 12 ++-- 3 files changed, 40 insertions(+), 48 deletions(-) rename hack/provider/{provider-debug.yaml => provider.yaml.debug} (68%) diff --git a/hack/provider/provider.yaml b/hack/provider/provider.yaml index 2ae8336..db2d574 100644 --- a/hack/provider/provider.yaml +++ b/hack/provider/provider.yaml @@ -126,16 +126,16 @@ agent: inactivityTimeout: ${INACTIVITY_TIMEOUT} injectGitCredentials: ${INJECT_GIT_CREDENTIALS} injectDockerCredentials: ${INJECT_DOCKER_CREDENTIALS} - binaries: - OTC_PROVIDER: - - os: linux - arch: amd64 - path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/##VERSION##/devpod-provider-opentelekomcloud-linux-amd64 - checksum: ##CHECKSUM_LINUX_AMD64## - - os: linux - arch: arm64 - path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/##VERSION##/devpod-provider-opentelekomcloud-linux-arm64 - checksum: ##CHECKSUM_LINUX_ARM64## +# binaries: +# OTC_PROVIDER: +# - os: linux +# arch: amd64 +# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/##VERSION##/devpod-provider-opentelekomcloud-linux-amd64 +# checksum: ##CHECKSUM_LINUX_AMD64## +# - os: linux +# arch: arm64 +# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/##VERSION##/devpod-provider-opentelekomcloud-linux-arm64 +# checksum: ##CHECKSUM_LINUX_ARM64## exec: shutdown: |- ${OTC_PROVIDER} stop diff --git a/hack/provider/provider-debug.yaml b/hack/provider/provider.yaml.debug similarity index 68% rename from hack/provider/provider-debug.yaml rename to hack/provider/provider.yaml.debug index 3a6d9ed..3c37c32 100644 --- a/hack/provider/provider-debug.yaml +++ b/hack/provider/provider.yaml.debug @@ -1,5 +1,5 @@ name: opentelekomcloud -version: v0.0.3-beta +version: v0.0.4-develop.3 description: |- DevPod on OpenTelekomCloud icon: https://avatars.githubusercontent.com/u/19344672?s=200&v=4 @@ -127,41 +127,31 @@ agent: inactivityTimeout: ${INACTIVITY_TIMEOUT} injectGitCredentials: ${INJECT_GIT_CREDENTIALS} injectDockerCredentials: ${INJECT_DOCKER_CREDENTIALS} -# binaries: -# OTC_PROVIDER: -# - os: linux -# arch: amd64 -# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/v0.0.3-beta/devpod-provider-opentelekomcloud-linux-amd64 -# checksum: ##CHECKSUM_LINUX_AMD64## -# - os: linux -# arch: arm64 -# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/v0.0.3-beta/devpod-provider-opentelekomcloud-linux-arm64 -# checksum: ##CHECKSUM_LINUX_ARM64## exec: shutdown: |- ${OTC_PROVIDER} stop -#binaries: -# OTC_PROVIDER: -# - os: linux -# arch: amd64 -# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/v0.0.3-beta/devpod-provider-opentelekomcloud-linux-amd64 -# checksum: ##CHECKSUM_LINUX_AMD64## -# - os: linux -# arch: arm64 -# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/v0.0.3-beta/devpod-provider-opentelekomcloud-linux-arm64 -# checksum: ##CHECKSUM_LINUX_ARM64## -# - os: darwin -# arch: amd64 -# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/v0.0.3-beta/devpod-provider-opentelekomcloud-darwin-amd64 -# checksum: ##CHECKSUM_DARWIN_AMD64## -# - os: darwin -# arch: arm64 -# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/v0.0.3-beta/devpod-provider-opentelekomcloud-darwin-arm64 -# checksum: ##CHECKSUM_DARWIN_ARM64## -# - os: windows -# arch: amd64 -# path: https://github.com/akyriako/devpod-provider-opentelekomcloud/releases/download/v0.0.3-beta/devpod-provider-opentelekomcloud-windows-amd64.exe -# checksum: ##CHECKSUM_WINDOWS_AMD64## +binaries: + OTC_PROVIDER: + - os: linux + arch: amd64 + path: /home/akyriako/go/src/github.com/akyriako/devpod-provider-opentelekomcloud/release/devpod-provider-opentelekomcloud-linux-amd64 + checksum: ##CHECKSUM_LINUX_AMD64## + - os: linux + arch: arm64 + path: /home/akyriako/go/src/github.com/akyriako/devpod-provider-opentelekomcloud/release/devpod-provider-opentelekomcloud-linux-arm64 + checksum: ##CHECKSUM_LINUX_ARM64## + - os: darwin + arch: amd64 + path: /home/akyriako/go/src/github.com/akyriako/devpod-provider-opentelekomcloud/release/devpod-provider-opentelekomcloud-darwin-amd64 + checksum: ##CHECKSUM_DARWIN_AMD64## + - os: darwin + arch: arm64 + path: /home/akyriako/go/src/github.com/akyriako/devpod-provider-opentelekomcloud/release/devpod-provider-opentelekomcloud-darwin-arm64 + checksum: ##CHECKSUM_DARWIN_ARM64## + - os: windows + arch: amd64 + path: /home/akyriako/go/src/github.com/akyriako/devpod-provider-opentelekomcloud/release/devpod-provider-opentelekomcloud-windows-amd64.exe + checksum: ##CHECKSUM_WINDOWS_AMD64## exec: init: ${OTC_PROVIDER} init command: ${OTC_PROVIDER} command diff --git a/pkg/options/options.go b/pkg/options/options.go index 72c384f..d8e9afc 100644 --- a/pkg/options/options.go +++ b/pkg/options/options.go @@ -132,18 +132,20 @@ func FromEnv(init bool) (*Options, error) { } retOptions.MachineID = os.Getenv(MACHINE_ID) - if retOptions.MachineID == "" { + if strings.TrimSpace(retOptions.MachineID) == "" { // create a MACHINE_ID postfix, err := password.Generate(4, 2, 0, true, true) if err != nil { return nil, err } + machineId := fmt.Sprintf("ecs-devpod-%s", postfix) retOptions.MachineID = machineId - err = os.Setenv(MACHINE_ID, machineId) - if err != nil { - return nil, err - } + + //err = os.Setenv(MACHINE_ID, machineId) + //if err != nil { + // return nil, err + //} } retOptions.MachineFolder, err = fromEnvOrError(MACHINE_FOLDER)