Merge pull request aenix-io#171 from aenix-io/flux-plugin-for-dashboard

Update flux plugin for dashboard
kingdonb · Jun 22, 2024 · c1757d0 · c1757d0
2 parents 366c942 + 9b4cd29
commit c1757d0
Show file tree

Hide file tree

Showing 7 changed files with 3,208 additions and 20 deletions.
diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json
@@ -7,4 +7,4 @@
   },
   "containerimage.digest": "sha256:e0c0defb9f5b10f5187d4002ccec7d01841e96c7350963f253003c0efeff6cef",
   "image.name": "ghcr.io/aenix-io/cozystack/cozystack:latest"
-}
+}
diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json
@@ -1,4 +1,4 @@
 {
-  "containerimage.config.digest": "sha256:44db4f7c92adb68c79eb3e152c95318e559e5c1ac0ba6e3d467596b1315f37a1",
-  "containerimage.digest": "sha256:b0c355cf5387b376e676a9e395fa0a11790409123a29e637a7080a413fe7f10d"
+  "containerimage.config.digest": "sha256:3fbaba7f41e9055839ecb30c1f0d505be732f79433fefdcfd352052d4ce52a19",
+  "containerimage.digest": "sha256:b33011eaf4dfe775287103f66b667b2976a053a59711103f405c6a5c5cc841bc"
 }
diff --git a/packages/system/dashboard/images/kubeapps-apis.tag b/packages/system/dashboard/images/kubeapps-apis.tag
@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.7.0
+ghcr.io/aenix-io/cozystack/kubeapps-apis:latest
diff --git a/packages/system/dashboard/images/kubeapps-apis/Dockerfile b/packages/system/dashboard/images/kubeapps-apis/Dockerfile
@@ -8,8 +8,10 @@ ARG VERSION=v2.10.0
 RUN apk add --no-cache patch
 WORKDIR /source
 RUN wget -O- https://github.com/vmware-tanzu/kubeapps/archive/refs/tags/${VERSION}.tar.gz | tar xzf - --strip-components=1
+COPY fluxcd.diff /patches/fluxcd.diff
 COPY labels.diff /patches/labels.diff
 COPY reconcile-strategy.diff /patches/reconcile-strategy.diff
+RUN patch -p1 < /patches/fluxcd.diff
 RUN patch -p1 < /patches/labels.diff
 RUN patch -p1 < /patches/reconcile-strategy.diff
 
@@ -70,15 +72,6 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \
     ./cmd/kubeapps-apis
 
-# Build 'kapp-controller' plugin, version 'v1alpha1'
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    GOPROXY="https://proxy.golang.org,direct" \
-    go build \
-    -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \
-    -o /kapp-controller-packages-v1alpha1-plugin.so -buildmode=plugin \
-    ./cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/*.go
-
 ## Build 'fluxv2' plugin, version 'v1alpha1'
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
@@ -111,7 +104,6 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 FROM bitnami/minideb:bookworm
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/vmware-tanzu/kubeapps/kubeapps-apis /kubeapps-apis
-COPY --from=builder /kapp-controller-packages-v1alpha1-plugin.so /plugins/kapp-controller-packages/
 COPY --from=builder /fluxv2-packages-v1alpha1-plugin.so /plugins/fluxv2-packages/
 COPY --from=builder /helm-packages-v1alpha1-plugin.so /plugins/helm-packages/
 COPY --from=builder /resources-v1alpha1-plugin.so /plugins/resources/
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
       },
       "containerimage.digest": "sha256:e0c0defb9f5b10f5187d4002ccec7d01841e96c7350963f253003c0efeff6cef",
       "image.name": "ghcr.io/aenix-io/cozystack/cozystack:latest"
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.7.0
		ghcr.io/aenix-io/cozystack/kubeapps-apis:latest