Skip to content

Commit a72840e

Browse files
casibbaldcasibbald
authored
Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint-8.46.0
2 parents 8e360ab + edec88f commit a72840e

31 files changed

+198
-102
lines changed

‎.github/dependabot.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ updates:
5959
prefix: fix
6060
include: scope
6161
groups:
62+
flux:
63+
patterns:
64+
- "github.com/fluxcd/*"
6265
golang-grpc:
6366
patterns:
6467
- google.golang.org/grpc

‎.github/workflows/nightly.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- run: pip install -r requirements.txt
5454

5555
- name: Setup Flux CLI
56-
uses: fluxcd/flux2/action@ca29bb1a41d662495cbf3a8ee6dba7f088ae7310 # v2.7.1
56+
uses: fluxcd/flux2/action@4a15fa6a023259353ef750acf1c98fe88407d4d0 # v2.7.2
5757

5858
- name: Install kubectl
5959
run: |

‎.github/workflows/ossf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444

4545
# required for Code scanning alerts
4646
- name: "Upload SARIF results to code scanning"
47-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
47+
uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
4848
with:
4949
sarif_file: results.sarif

‎.github/workflows/pr.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
go-version-file: go.mod
5151
- name: Setup Flux CLI
52-
uses: fluxcd/flux2/action@ca29bb1a41d662495cbf3a8ee6dba7f088ae7310 # v2.7.1
52+
uses: fluxcd/flux2/action@4a15fa6a023259353ef750acf1c98fe88407d4d0 # v2.7.2
5353
- run: make unit-tests
5454

5555
ci-static:

‎.github/workflows/scan.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
format: sarif
6565
output: trivy-results.sarif
6666
- name: Upload Trivy scan results to GitHub Security tab
67-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
67+
uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
6868
with:
6969
sarif_file: trivy-results.sarif
7070

@@ -77,10 +77,10 @@ jobs:
7777
- name: Checkout repository
7878
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7979
- name: Initialize CodeQL
80-
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
80+
uses: github/codeql-action/init@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
8181
with:
8282
languages: go
8383
- name: Autobuild
84-
uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
84+
uses: github/codeql-action/autobuild@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
8585
- name: Perform CodeQL Analysis
86-
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
86+
uses: github/codeql-action/analyze@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7

‎core/fluxsync/adapters.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ package fluxsync
22

33
import (
44
helmv2 "github.com/fluxcd/helm-controller/api/v2"
5-
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
6-
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
5+
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1"
6+
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1"
77
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
88
"github.com/fluxcd/pkg/apis/meta"
99
sourcev1 "github.com/fluxcd/source-controller/api/v1"
10-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
1110
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1211
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1312
"k8s.io/apimachinery/pkg/runtime"
@@ -144,7 +143,7 @@ func (obj HelmRepositoryAdapter) DeepCopyClientObject() client.Object {
144143
}
145144

146145
type OCIRepositoryAdapter struct {
147-
*sourcev1b2.OCIRepository
146+
*sourcev1.OCIRepository
148147
}
149148

150149
func (obj OCIRepositoryAdapter) GetLastHandledReconcileRequest() string {
@@ -156,7 +155,7 @@ func (obj OCIRepositoryAdapter) AsClientObject() client.Object {
156155
}
157156

158157
func (obj OCIRepositoryAdapter) GroupVersionKind() schema.GroupVersionKind {
159-
return sourcev1b2.GroupVersion.WithKind(sourcev1b2.OCIRepositoryKind)
158+
return sourcev1.GroupVersion.WithKind(sourcev1.OCIRepositoryKind)
160159
}
161160

162161
func (obj OCIRepositoryAdapter) SetSuspended(suspend bool) error {
@@ -380,8 +379,8 @@ func ToReconcileable(gvk schema.GroupVersionKind) Reconcilable {
380379
return HelmRepositoryAdapter{HelmRepository: &sourcev1.HelmRepository{}}
381380
case sourcev1.HelmChartKind:
382381
return HelmChartAdapter{HelmChart: &sourcev1.HelmChart{}}
383-
case sourcev1b2.OCIRepositoryKind:
384-
return OCIRepositoryAdapter{OCIRepository: &sourcev1b2.OCIRepository{}}
382+
case sourcev1.OCIRepositoryKind:
383+
return OCIRepositoryAdapter{OCIRepository: &sourcev1.OCIRepository{}}
385384
case reflectorv1.ImageRepositoryKind:
386385
return ImageRepositoryAdapter{ImageRepository: &reflectorv1.ImageRepository{}}
387386
case imgautomationv1.ImageUpdateAutomationKind:

‎core/server/suspend_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55

66
helmv2 "github.com/fluxcd/helm-controller/api/v2"
7-
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
8-
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
7+
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1"
8+
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1"
99
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
1010
sourcev1 "github.com/fluxcd/source-controller/api/v1"
1111
. "github.com/onsi/gomega"

‎core/server/sync_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ import (
77
"time"
88

99
helmv2 "github.com/fluxcd/helm-controller/api/v2"
10-
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
11-
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
10+
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1"
11+
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1"
1212
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
1313
"github.com/fluxcd/pkg/apis/meta"
1414
sourcev1 "github.com/fluxcd/source-controller/api/v1"
15-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
1615
. "github.com/onsi/gomega"
1716
"google.golang.org/grpc/metadata"
1817
corev1 "k8s.io/api/core/v1"
@@ -159,7 +158,7 @@ func TestSync(t *testing.T) {
159158
msg: &pb.SyncFluxObjectRequest{
160159
Objects: []*pb.ObjectRef{{
161160
ClusterName: "Default",
162-
Kind: sourcev1b2.OCIRepositoryKind,
161+
Kind: sourcev1.OCIRepositoryKind,
163162
}},
164163
WithSource: false,
165164
},
@@ -309,7 +308,7 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac
309308

310309
return k.Status().Update(ctx, obj)
311310

312-
case *sourcev1b2.OCIRepository:
311+
case *sourcev1.OCIRepository:
313312
if err := k.Get(ctx, name, obj); err != nil {
314313
return err
315314
}
@@ -463,16 +462,16 @@ func makeHelmRelease(name string, ns corev1.Namespace, repo *sourcev1.HelmReposi
463462
}
464463
}
465464

466-
func makeOCIRepo(name string, ns corev1.Namespace) *sourcev1b2.OCIRepository {
467-
return &sourcev1b2.OCIRepository{
465+
func makeOCIRepo(name string, ns corev1.Namespace) *sourcev1.OCIRepository {
466+
return &sourcev1.OCIRepository{
468467
ObjectMeta: metav1.ObjectMeta{
469468
Name: name,
470469
Namespace: ns.Name,
471470
},
472-
Spec: sourcev1b2.OCIRepositorySpec{
471+
Spec: sourcev1.OCIRepositorySpec{
473472
URL: "oci://ghcr.io/some/chart",
474473
},
475-
Status: sourcev1b2.OCIRepositoryStatus{
474+
Status: sourcev1.OCIRepositoryStatus{
476475
ReconcileRequestStatus: meta.ReconcileRequestStatus{
477476
LastHandledReconcileAt: time.Now().Format(time.RFC3339Nano),
478477
},

‎gitops-server.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPY --chown=node:node ui /home/app/ui
1818
RUN make ui
1919

2020
# Go build
21-
FROM golang:1.25.1@sha256:d7098379b7da665ab25b99795465ec320b1ca9d4addb9f77409c4827dc904211 AS go-build
21+
FROM golang:1.25.2@sha256:1c91b4f4391774a73d6489576878ad3ff3161ebc8c78466ec26e83474855bfcf AS go-build
2222

2323
# Add known_hosts entries for GitHub and GitLab
2424
RUN mkdir ~/.ssh

‎gitops.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG FLUX_CLI=ghcr.io/fluxcd/flux-cli:v$FLUX_VERSION
55
FROM $FLUX_CLI@sha256:a9cb966cddc1a0c56dc0d57dda485d9477dd397f8b45f222717b24663471fd1f AS flux
66

77
# Go build
8-
FROM golang:1.25.1@sha256:d7098379b7da665ab25b99795465ec320b1ca9d4addb9f77409c4827dc904211 AS go-build
8+
FROM golang:1.25.2@sha256:1c91b4f4391774a73d6489576878ad3ff3161ebc8c78466ec26e83474855bfcf AS go-build
99

1010
# Add known_hosts entries for GitHub and GitLab
1111
RUN mkdir ~/.ssh

0 commit comments

Comments
 (0)