diff --git a/cmd/main.go b/cmd/main.go index ce95c1e..f716328 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -57,7 +57,7 @@ func action() error { release := flag.String("r", "dev", "Release name in run") namespace := flag.String("n", "dev", "Namespace in run") branch := flag.String("b", "main", "Git branch/version of a OC build") - target := flag.String("y", "all", "Makefile build up mode") + target := flag.String("t", "all", "Makefile build up mode") dbName := flag.String("d", "opencloud", "DBName in use") arch := flag.String("a", "amd64", "Arch expected") version := flag.String("v", "v0.31.0", "version of arch") @@ -65,7 +65,7 @@ func action() error { mUsr := flag.String("m", "admin", "Mongo user") mPwd := flag.String("M", "admin", "Mongo password") - build := flag.Bool("build", true, "build mode") + build := flag.Bool("build", false, "build mode") if len(os.Args) > 2 && slices.Contains([]string{"start", "help", "stop"}, os.Args[1]) { flag.CommandLine.Parse(os.Args[2:]) diff --git a/cmd/oc-k8s b/cmd/oc-k8s index 0e11f7d..9178378 100755 Binary files a/cmd/oc-k8s and b/cmd/oc-k8s differ diff --git a/utils/assets/values.yaml.template b/utils/assets/values.yaml.template index ab9c677..e093a04 100644 --- a/utils/assets/values.yaml.template +++ b/utils/assets/values.yaml.template @@ -3,7 +3,7 @@ clusterName: ${CLUSTER_NAME:-opencloud} hostNetwork: true host: ${HOST:-beta.opencloud.com} hostPort: ${PORT:-80} -registryHost: ${REGISTRY_HOST:-oc} +registryHost: ${REGISTRY_HOST:-opencloudregistry} scheme: ${SCHEME:-http} secrets: @@ -429,7 +429,7 @@ argo-workflows: ocAuth: enabled: ${OC_AUTH_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-auth:${OC_AUTH_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-auth:${OC_AUTH_IMAGE_VERSION:-latest} authType: hydra keto: adminRole: admin @@ -458,7 +458,7 @@ ocAuth: ocFront: enabled: ${OC_FRONT_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-front:${OC_FRONT_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-front:${OC_FRONT_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_FRONT_LIMITS_CPU:-128m} @@ -476,7 +476,7 @@ ocFront: ocWorkspace: enabled: ${OC_WORKSPACE_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-workspace:${OC_WORKSPACE_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-workspace:${OC_WORKSPACE_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_WORKSPACE_LIMITS_CPU:-128m} @@ -495,7 +495,7 @@ ocWorkspace: ocShared: enabled: ${OC_SHARED_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-shared:${OC_SHARED_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-shared:${OC_SHARED_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_SHARED_LIMITS_CPU:-128m} @@ -513,7 +513,7 @@ ocShared: ocWorkflow: enabled: ${OC_WORKFLOW_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-workflow:${OC_WORKFLOW_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-workflow:${OC_WORKFLOW_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_WORKFLOW_LIMITS_CPU:-128m} @@ -531,7 +531,7 @@ ocWorkflow: ocCatalog: enabled: ${OC_CATALOG_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-catalog:${OC_CATALOG_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-catalog:${OC_CATALOG_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_CATALOG_LIMITS_CPU:-128m} @@ -549,7 +549,7 @@ ocCatalog: ocPeer: enabled: ${OC_PEER_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-peer:${OC_PEER_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-peer:${OC_PEER_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_PEER_LIMITS_CPU:-128m} @@ -567,7 +567,7 @@ ocPeer: ocDatacenter: enabled: ${OC_DATACENTER_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-datacenter:${OC_DATACENTER_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-datacenter:${OC_DATACENTER_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_DATACENTER_LIMITS_CPU:-128m} @@ -585,7 +585,7 @@ ocDatacenter: ocDiscovery: enabled: ${OC_DISCOVERY_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-schedulerd:${OC_DISCOVERY_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-schedulerd:${OC_DISCOVERY_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_DISCOVERY_LIMITS_CPU:-128m} @@ -603,7 +603,7 @@ ocDiscovery: ocSchedulerd: enabled: ${OC_SCHEDULERD_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-schedulerd:${OC_SCHEDULERD_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-schedulerd:${OC_SCHEDULERD_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_SCHEDULERD_LIMITS_CPU:-128m} @@ -621,7 +621,7 @@ ocSchedulerd: ocScheduler: enabled: ${OC_SCHEDULER_ENABLED:-true} enableTraefikProxyIntegration: true - image: ${REGISTRY_HOST:-oc}/oc-scheduler:${OC_SCHEDULER_IMAGE_VERSION:-0.0.1} + image: ${REGISTRY_HOST:-opencloudregistry}/oc-scheduler:${OC_SCHEDULER_IMAGE_VERSION:-latest} resources: limits: cpu: ${OC_SCHEDULER_LIMITS_CPU:-128m}