f

Author: emosbaugh

Makefile

@@ -349,41 +349,3 @@ check-env-%:
 		echo "Environment variable $* not set"; \
 		exit 1; \
 	fi
-
-# THIS IS TEMPORARY UNTIL I INTEGRATE WITH BUILDTOOLS
-
-.PHONY: build-openebs-linux-utils-image
-build-openebs-linux-utils-image: export IMAGE ?= ttl.sh/replicated/ec-openebs-linux-utils:4.1.0
-build-openebs-linux-utils-image: export PACKAGE_VERSION ?= 4.1.0
-build-openebs-linux-utils-image: export APKO_CONFIG = deploy/images/openebs-linux-utils/apko.tmpl.yaml
-build-openebs-linux-utils-image: apko-build
-
-.PHONY: build-and-push-openebs-linux-utils-image
-build-and-push-openebs-linux-utils-image: export IMAGE ?= ttl.sh/replicated/ec-openebs-linux-utils:4.1.0
-build-and-push-openebs-linux-utils-image: export PACKAGE_VERSION ?= 4.1.0
-build-and-push-openebs-linux-utils-image: export APKO_CONFIG = deploy/images/openebs-linux-utils/apko.tmpl.yaml
-build-and-push-openebs-linux-utils-image: apko-login apko-build-and-publish
-
-.PHONY: build-openebs-kubectl-image
-build-openebs-kubectl-image: export IMAGE ?= ttl.sh/replicated/ec-openebs-kubectl:1.29
-build-openebs-kubectl-image: export PACKAGE_VERSION ?= 1.29
-build-openebs-kubectl-image: export APKO_CONFIG = deploy/images/openebs-kubectl/apko.tmpl.yaml
-build-openebs-kubectl-image: apko-build
-
-.PHONY: build-and-push-openebs-kubectl-image
-build-and-push-openebs-kubectl-image: export IMAGE ?= ttl.sh/replicated/ec-openebs-kubectl:1.29
-build-and-push-openebs-kubectl-image: export PACKAGE_VERSION ?= 1.29
-build-and-push-openebs-kubectl-image: export APKO_CONFIG = deploy/images/openebs-kubectl/apko.tmpl.yaml
-build-and-push-openebs-kubectl-image: apko-login apko-build-and-publish
-
-.PHONY: build-openebs-provisioner-localpv-image
-build-openebs-provisioner-localpv-image: export IMAGE ?= ttl.sh/replicated/ec-openebs-provisioner-localpv:4.1.0
-build-openebs-provisioner-localpv-image: export PACKAGE_VERSION ?= 4.1.0
-build-openebs-provisioner-localpv-image: export APKO_CONFIG = deploy/images/openebs-provisioner-localpv/apko.tmpl.yaml
-build-openebs-provisioner-localpv-image: apko-build
-
-.PHONY: build-and-push-openebs-provisioner-localpv-image
-build-and-push-openebs-provisioner-localpv-image: export IMAGE ?= ttl.sh/replicated/ec-openebs-provisioner-localpv:4.1.0
-build-and-push-openebs-provisioner-localpv-image: export PACKAGE_VERSION ?= 4.1.0
-build-and-push-openebs-provisioner-localpv-image: export APKO_CONFIG = deploy/images/openebs-provisioner-localpv/apko.tmpl.yaml
-build-and-push-openebs-provisioner-localpv-image: apko-login apko-build-and-publish

cmd/buildtools/k0s.go

@@ -74,6 +74,8 @@ var updateK0sImagesCommand = &cli.Command{
 				return fmt.Errorf("failed to get package version for %s: %w", component.name, err)
 			}
 
+			logrus.Infof("building and publishing %s@%s", component.name, packageVersion)
+
 			if err := ApkoBuildAndPublish(component.name, packageVersion); err != nil {
 				return fmt.Errorf("failed to apko build and publish for %s: %w", component.name, err)
 			}

cmd/buildtools/openebs.go

@@ -151,6 +151,8 @@ var updateOpenEBSImagesCommand = &cli.Command{
 				}
 			}
 
+			logrus.Infof("building and publishing %s@%s", component.name, packageVersion)
+
 			extraArgs := []string{}
 			if packageName != "" {
 				extraArgs = append(extraArgs, fmt.Sprintf("PACKAGE_NAME=%s", packageName))