github-personal/cozystack
1
0
Fork 0
mirror of https://github.com/outbackdingo/cozystack.git synced 2026-01-28 02:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Update flux plugin for dashboard
This commit is contained in:
Marian Koreniuk
2024-06-19 16:57:46 +02:00
committed by GitHub
parent 931e39fb5c 2dd2b079b2
commit 1519f40767
8 changed files with 3210 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/installer/images/cozystack.json
View File

@@ -1,4 +1,4 @@
{
"containerimage.config.digest": "sha256:6d54a5b971e80fbaace664054d4e67f24fd1fbb7807ebaffd036d4ea7195df10",
"containerimage.digest": "sha256:a6b167235d8556ff7e45f4582c2491a2ad48292a46005dcf767908e2fb78e74e"
"containerimage.config.digest": "sha256:c5641297fd8c314272047ae02461871e73c6eb3bdf64d5acd7f971917a28d48e",
"containerimage.digest": "sha256:e4838be7d0032f45213ccd0044deae263cd79f87cb1aa1c2a5c1efcc8337aad8"
}

2
packages/core/installer/images/cozystack.tag
View File

@@ -1 +1 @@
ghcr.io/aenix-io/cozystack/cozystack:v0.7.0
ghcr.io/aenix-io/cozystack/cozystack:latest

4
packages/system/dashboard/images/kubeapps-apis.json
View File

@@ -1,4 +1,4 @@
{
"containerimage.config.digest": "sha256:44db4f7c92adb68c79eb3e152c95318e559e5c1ac0ba6e3d467596b1315f37a1",
"containerimage.digest": "sha256:b0c355cf5387b376e676a9e395fa0a11790409123a29e637a7080a413fe7f10d"
"containerimage.config.digest": "sha256:3fbaba7f41e9055839ecb30c1f0d505be732f79433fefdcfd352052d4ce52a19",
"containerimage.digest": "sha256:b33011eaf4dfe775287103f66b667b2976a053a59711103f405c6a5c5cc841bc"
}

2
packages/system/dashboard/images/kubeapps-apis.tag
View File

@@ -1 +1 @@
ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.7.0
ghcr.io/aenix-io/cozystack/kubeapps-apis:latest

12
packages/system/dashboard/images/kubeapps-apis/Dockerfile
View File

@@ -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/

3196
packages/system/dashboard/images/kubeapps-apis/fluxcd.diff Normal file
View File

File diff suppressed because it is too large Load Diff

10
packages/system/dashboard/images/kubeapps-apis/labels.diff
View File

@@ -16,7 +16,7 @@ index c489cb6ca..8884a6484 100644
@@ -54,7 +56,10 @@ func (s *Server) listReleasesInCluster(ctx context.Context, headers http.Header,
// see any results created/updated/deleted after the first request is issued
// To fix this, we must make use of resourceVersion := relList.GetResourceVersion()
var relList helmv2beta2.HelmReleaseList
var relList helmv2.HelmReleaseList
- if err = client.List(ctx, &relList); err != nil {
+ listOptions := ctrlclient.ListOptions{
+ LabelSelector: labels.SelectorFromSet(labels.Set{"cozystack.io/ui": "true"}),
@@ -33,8 +33,8 @@ index c489cb6ca..8884a6484 100644
+ "cozystack.io/ui": "true",
+ },
},
Spec: helmv2beta2.HelmReleaseSpec{
Chart: helmv2beta2.HelmChartTemplate{
Spec: helmv2.HelmReleaseSpec{
Chart: helmv2.HelmChartTemplate{
diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo.go
index 790b21514..539276a17 100644
--- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo.go
@@ -49,7 +49,7 @@ index 790b21514..539276a17 100644
log "k8s.io/klog/v2"
@@ -64,7 +65,8 @@ func (s *Server) listReposInNamespace(ctx context.Context, headers http.Header,
var repoList sourcev1beta2.HelmRepositoryList
var repoList sourcev1.HelmRepositoryList
listOptions := ctrlclient.ListOptions{
- Namespace: ns,
+ Namespace: ns,
@@ -65,5 +65,5 @@ index 790b21514..539276a17 100644
+ "cozystack.io/ui": "true",
+ },
},
Spec: sourcev1beta2.HelmRepositorySpec{
Spec: sourcev1.HelmRepositorySpec{
URL: url,

2
packages/system/dashboard/images/kubeapps-apis/reconcile-strategy.diff
View File

@@ -3,7 +3,7 @@ index 8884a6484..4bf77071c 100644
--- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go
+++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go
@@ -530,6 +530,7 @@ func (s *Server) newFluxHelmRelease(chart *models.Chart, targetName types.Namesp
Kind: sourcev1beta2.HelmRepositoryKind,
Kind: sourcev1.HelmRepositoryKind,
Namespace: chart.Repo.Namespace,
},
+ ReconcileStrategy: "Revision",