fix(ci): ref_name for edge tags (#587 )

fix(ci): triggering action upon tags (#586 )
Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>
2026-03-02 01:30:43 +00:00 · 2024-09-20 11:47:55 +02:00 · 2024-09-20 11:44:29 +02:00 · 2024-09-20 11:10:18 +02:00 · 2024-09-20 10:53:49 +02:00 · 2024-09-20 10:49:54 +02:00
4 changed files with 12 additions and 6 deletions
--- a/.github/workflows/ko-build.yml
+++ b/.github/workflows/ko-build.yml
@@ -2,6 +2,9 @@ name: Container image build

 on:
  push:
+    tags:
+      - edge-*
+      - v*
    branches:
      - master

@@ -21,8 +24,8 @@ jobs:
        run: ./bin/ko login quay.io -u ${{ secrets.QUAY_IO_USERNAME }} -p ${{ secrets.QUAY_IO_TOKEN }}
      - name: "ko: login to docker.io container registry"
        run: ./bin/ko login docker.io -u ${{ secrets.DOCKER_IO_USERNAME }} -p ${{ secrets.DOCKER_IO_TOKEN }}
-      - name: "ko: build and push latest"
-        run: make VERSION=latest KO_LOCAL=false KO_PUSH=true build
      - name: "ko: build and push tag"
        run: make VERSION=${{ github.ref_name }} KO_LOCAL=false KO_PUSH=true build
-        if: startsWith(github.event.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/edge-')
+      - name: "ko: build and push latest"
+        run: make VERSION=latest KO_LOCAL=false KO_PUSH=true build
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/JamesStewy/go-mysqldump v0.2.2
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/clastix/kamaji-telemetry v1.0.0
-	github.com/docker/docker v27.2.1+incompatible
+	github.com/docker/docker v27.3.0+incompatible
 	github.com/go-logr/logr v1.4.2
 	github.com/go-pg/pg/v10 v10.13.0
 	github.com/go-sql-driver/mysql v1.8.1
--- a/go.sum
+++ b/go.sum
@@ -60,8 +60,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.2.1+incompatible h1:fQdiLfW7VLscyoeYEBz7/J8soYFDZV1u6VW6gJEjNMI=
-github.com/docker/docker v27.2.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.3.0+incompatible h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A=
+github.com/docker/docker v27.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
--- a/internal/kubeadm/uploadconfig.go
+++ b/internal/kubeadm/uploadconfig.go
@@ -89,6 +89,9 @@ func getKubeletConfigmapContent(kubeletConfiguration KubeletConfiguration) ([]by
 	// kubeadm <= v1.27 has a different type for FlushFrequency
 	// https://github.com/kubernetes/component-base/blob/55b3ab0db0081303695d641b9b43d560bf3f7a65/logs/api/v1/types.go#L42-L45
 	kc.Logging.FlushFrequency.SerializeAsString = false
+	// Restore default behaviour so Kubelet will automatically
+	// determine the resolvConf location, as reported in clastix/kamaji#581.
+	kc.ResolverConfig = nil

 	return utilities.EncodeToYaml(&kc)
 }
Author	SHA1	Message	Date
Dario Tranchitella	96fc9149a0	fix(ci): ref_name for edge tags (#587 )	2024-09-20 11:47:55 +02:00
Dario Tranchitella	3e4e45cd6e	fix(ci): triggering action upon tags (#586 ) Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>	2024-09-20 11:44:29 +02:00
Dario Tranchitella	11bda430c6	fix(ci): building in case of edge or stable tag (#585 ) Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>	2024-09-20 11:10:18 +02:00
Dario Tranchitella	293387e0d1	chore(ci): building and pushing edge images (#584 )	2024-09-20 10:53:49 +02:00
dependabot[bot]	092eeb0274	feat(deps): bump github.com/docker/docker (#583 ) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.2.1+incompatible to 27.3.0+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.2.1...v27.3.0) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-09-20 10:49:54 +02:00
Wouter van Os	f483e812a5	fix(kubeadm): let Kubelet automatically determine resolvConf (#582 )	2024-09-19 19:15:30 +02:00