Skip to content

Commit e639353

Browse files
erikgberikgb
committed
chore: update references to deprecated Flux APIs
1 parent cce1764 commit e639353

File tree

747 files changed

+1499
-1499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

747 files changed

+1499
-1499
lines changed

‎core/fluxsync/adapters.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (obj BucketAdapter) DeepCopyClientObject() client.Object {
9494
}
9595

9696
type HelmChartAdapter struct {
97-
*sourcev1b2.HelmChart
97+
*sourcev1.HelmChart
9898
}
9999

100100
func (obj HelmChartAdapter) GetLastHandledReconcileRequest() string {
@@ -119,7 +119,7 @@ func (obj HelmChartAdapter) DeepCopyClientObject() client.Object {
119119
}
120120

121121
type HelmRepositoryAdapter struct {
122-
*sourcev1b2.HelmRepository
122+
*sourcev1.HelmRepository
123123
}
124124

125125
func (obj HelmRepositoryAdapter) GetLastHandledReconcileRequest() string {
@@ -376,10 +376,10 @@ func ToReconcileable(gvk schema.GroupVersionKind) Reconcilable {
376376
return GitRepositoryAdapter{GitRepository: &sourcev1.GitRepository{}}
377377
case sourcev1.BucketKind:
378378
return BucketAdapter{Bucket: &sourcev1.Bucket{}}
379-
case sourcev1b2.HelmRepositoryKind:
380-
return HelmRepositoryAdapter{HelmRepository: &sourcev1b2.HelmRepository{}}
381-
case sourcev1b2.HelmChartKind:
382-
return HelmChartAdapter{HelmChart: &sourcev1b2.HelmChart{}}
379+
case sourcev1.HelmRepositoryKind:
380+
return HelmRepositoryAdapter{HelmRepository: &sourcev1.HelmRepository{}}
381+
case sourcev1.HelmChartKind:
382+
return HelmChartAdapter{HelmChart: &sourcev1.HelmChart{}}
383383
case sourcev1b2.OCIRepositoryKind:
384384
return OCIRepositoryAdapter{OCIRepository: &sourcev1b2.OCIRepository{}}
385385
case reflectorv1.ImageRepositoryKind:

‎core/server/sync_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac
291291

292292
return k.Status().Update(ctx, obj)
293293

294-
case *sourcev1b2.HelmChart:
294+
case *sourcev1.HelmChart:
295295
if err := k.Get(ctx, name, obj); err != nil {
296296
return err
297297
}
@@ -300,7 +300,7 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac
300300

301301
return k.Status().Update(ctx, obj)
302302

303-
case *sourcev1b2.HelmRepository:
303+
case *sourcev1.HelmRepository:
304304
if err := k.Get(ctx, name, obj); err != nil {
305305
return err
306306
}
@@ -382,21 +382,21 @@ func makeKustomization(name string, ns corev1.Namespace, source *sourcev1.GitRep
382382
return k
383383
}
384384

385-
func makeHelmChart(name string, ns corev1.Namespace) *sourcev1b2.HelmChart {
386-
return &sourcev1b2.HelmChart{
385+
func makeHelmChart(name string, ns corev1.Namespace) *sourcev1.HelmChart {
386+
return &sourcev1.HelmChart{
387387
ObjectMeta: metav1.ObjectMeta{
388388
Name: name,
389389
Namespace: ns.Name,
390390
},
391-
Spec: sourcev1b2.HelmChartSpec{
391+
Spec: sourcev1.HelmChartSpec{
392392
Chart: "somechart",
393393
Version: "v0.0.1",
394-
SourceRef: sourcev1b2.LocalHelmChartSourceReference{
395-
Kind: sourcev1b2.HelmRepositoryKind,
394+
SourceRef: sourcev1.LocalHelmChartSourceReference{
395+
Kind: sourcev1.HelmRepositoryKind,
396396
Name: name,
397397
},
398398
},
399-
Status: sourcev1b2.HelmChartStatus{
399+
Status: sourcev1.HelmChartStatus{
400400
ReconcileRequestStatus: meta.ReconcileRequestStatus{
401401
LastHandledReconcileAt: time.Now().Format(time.RFC3339Nano),
402402
},
@@ -419,24 +419,24 @@ func makeBucket(name string, ns corev1.Namespace) *sourcev1.Bucket {
419419
}
420420
}
421421

422-
func makeHelmRepo(name string, ns corev1.Namespace) *sourcev1b2.HelmRepository {
423-
return &sourcev1b2.HelmRepository{
422+
func makeHelmRepo(name string, ns corev1.Namespace) *sourcev1.HelmRepository {
423+
return &sourcev1.HelmRepository{
424424
ObjectMeta: metav1.ObjectMeta{
425425
Name: name,
426426
Namespace: ns.Name,
427427
},
428-
Spec: sourcev1b2.HelmRepositorySpec{
428+
Spec: sourcev1.HelmRepositorySpec{
429429
URL: "http://example.com",
430430
},
431-
Status: sourcev1b2.HelmRepositoryStatus{
431+
Status: sourcev1.HelmRepositoryStatus{
432432
ReconcileRequestStatus: meta.ReconcileRequestStatus{
433433
LastHandledReconcileAt: time.Now().Format(time.RFC3339Nano),
434434
},
435435
},
436436
}
437437
}
438438

439-
func makeHelmRelease(name string, ns corev1.Namespace, repo *sourcev1b2.HelmRepository, chart *sourcev1b2.HelmChart) *helmv2.HelmRelease {
439+
func makeHelmRelease(name string, ns corev1.Namespace, repo *sourcev1.HelmRepository, chart *sourcev1.HelmChart) *helmv2.HelmRelease {
440440
return &helmv2.HelmRelease{
441441
ObjectMeta: metav1.ObjectMeta{
442442
Name: name,
@@ -450,7 +450,7 @@ func makeHelmRelease(name string, ns corev1.Namespace, repo *sourcev1b2.HelmRepo
450450
SourceRef: helmv2.CrossNamespaceObjectReference{
451451
Name: repo.GetName(),
452452
Namespace: repo.GetNamespace(),
453-
Kind: sourcev1b2.HelmRepositoryKind,
453+
Kind: sourcev1.HelmRepositoryKind,
454454
},
455455
},
456456
},

‎doc/setting-up-dex.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ kind: Namespace
3232
metadata:
3333
name: cert-manager
3434
---
35-
apiVersion: source.toolkit.fluxcd.io/v1beta1
35+
apiVersion: source.toolkit.fluxcd.io/v1
3636
kind: HelmRepository
3737
metadata:
3838
name: cert-manager
@@ -41,7 +41,7 @@ spec:
4141
interval: 1h
4242
url: https://charts.jetstack.io
4343
---
44-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
44+
apiVersion: helm.toolkit.fluxcd.io/v2
4545
kind: HelmRelease
4646
metadata:
4747
name: cert-manager
@@ -120,7 +120,7 @@ As we did before, we can use `HelmRepository` and `HelmRelease` objects to let
120120
Flux deploy everything.
121121
```yaml
122122
---
123-
apiVersion: source.toolkit.fluxcd.io/v1beta1
123+
apiVersion: source.toolkit.fluxcd.io/v1
124124
kind: HelmRepository
125125
metadata:
126126
name: dex
@@ -129,7 +129,7 @@ spec:
129129
interval: 1m
130130
url: https://charts.dexidp.io
131131
---
132-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
132+
apiVersion: helm.toolkit.fluxcd.io/v2
133133
kind: HelmRelease
134134
metadata:
135135
name: dex

‎pkg/kube/kubehttp.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
1212
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
1313
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
14-
notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2"
14+
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
1515
sourcev1 "github.com/fluxcd/source-controller/api/v1"
1616
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
1717
appsv1 "k8s.io/api/apps/v1"
@@ -42,7 +42,7 @@ func CreateScheme() (*apiruntime.Scheme, error) {
4242
rbacv1.AddToScheme,
4343
authv1.AddToScheme,
4444
notificationv1.AddToScheme,
45-
notificationv1b2.AddToScheme,
45+
notificationv1b3.AddToScheme,
4646
pacv2beta2.AddToScheme,
4747
reflectorv1.AddToScheme,
4848
imgautomationv1.AddToScheme,

‎pkg/utils/testdata/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: source.toolkit.fluxcd.io/v1beta2
1+
apiVersion: source.toolkit.fluxcd.io/v1
22
kind: HelmRepository
33
metadata:
44
name: ww-gitops
@@ -9,7 +9,7 @@ spec:
99
name: flux-system
1010
url: https://ww-helm.com
1111
---
12-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
12+
apiVersion: helm.toolkit.fluxcd.io/v2
1313
kind: HelmRelease
1414
metadata:
1515
name: ww-gitops

‎pkg/utils/testdata/partial-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: source.toolkit.fluxcd.io/v1beta2
1+
apiVersion: source.toolkit.fluxcd.io/v1
22
kind: HelmRepository
33
metadata:
44
name: ww-gitops

‎ui/lib/__tests__/dependencies.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ describe("dependencies", () => {
132132
const response = {
133133
object: {
134134
payload:
135-
'{"apiVersion":"kustomize.toolkit.fluxcd.io/v1beta2","kind":"Kustomization","metadata":{"creationTimestamp":"2022-09-11T21:00:14Z","finalizers":["finalizers.fluxcd.io"],"generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"kustomization-testdependencies","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"name":"kustomizationc","namespace":"default","resourceVersion":"157207","uid":"5ae733f8-c4dd-4846-a4dd-c4d5c4b01340"},"spec":{"dependsOn":[{"name":"kustomizationa"}],"force":false,"healthChecks":[{"kind":"Deployment","name":"frontend","namespace":"webapp"}],"interval":"5m","path":"./deploy/webapp/frontend/","prune":true,"sourceRef":{"kind":"GitRepository","name":"webapp"},"timeout":"2m","validation":"server"},"status":{"conditions":[{"lastTransitionTime":"2022-09-12T02:01:00Z","message":"Applied revision: 6.2.0/79f81383288bf6542fcb5bdd8144b826b33b36e7","reason":"ReconciliationSucceeded","status":"True","type":"Ready"},{"lastTransitionTime":"2022-09-12T02:01:00Z","message":"ReconciliationSucceeded","reason":"ReconciliationSucceeded","status":"True","type":"Healthy"}],"inventory":{"entries":[{"id":"webapp_frontend__Service","v":"v1"},{"id":"webapp_frontend_apps_Deployment","v":"v1"},{"id":"webapp_frontend_autoscaling_HorizontalPodAutoscaler","v":"v2beta2"}]},"lastAppliedRevision":"6.2.0/79f81383288bf6542fcb5bdd8144b826b33b36e7","lastAttemptedRevision":"6.2.0/79f81383288bf6542fcb5bdd8144b826b33b36e7","observedGeneration":1}}',
135+
'{"apiVersion":"kustomize.toolkit.fluxcd.io/v1","kind":"Kustomization","metadata":{"creationTimestamp":"2022-09-11T21:00:14Z","finalizers":["finalizers.fluxcd.io"],"generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"kustomization-testdependencies","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"name":"kustomizationc","namespace":"default","resourceVersion":"157207","uid":"5ae733f8-c4dd-4846-a4dd-c4d5c4b01340"},"spec":{"dependsOn":[{"name":"kustomizationa"}],"force":false,"healthChecks":[{"kind":"Deployment","name":"frontend","namespace":"webapp"}],"interval":"5m","path":"./deploy/webapp/frontend/","prune":true,"sourceRef":{"kind":"GitRepository","name":"webapp"},"timeout":"2m","validation":"server"},"status":{"conditions":[{"lastTransitionTime":"2022-09-12T02:01:00Z","message":"Applied revision: 6.2.0/79f81383288bf6542fcb5bdd8144b826b33b36e7","reason":"ReconciliationSucceeded","status":"True","type":"Ready"},{"lastTransitionTime":"2022-09-12T02:01:00Z","message":"ReconciliationSucceeded","reason":"ReconciliationSucceeded","status":"True","type":"Healthy"}],"inventory":{"entries":[{"id":"webapp_frontend__Service","v":"v1"},{"id":"webapp_frontend_apps_Deployment","v":"v1"},{"id":"webapp_frontend_autoscaling_HorizontalPodAutoscaler","v":"v2beta2"}]},"lastAppliedRevision":"6.2.0/79f81383288bf6542fcb5bdd8144b826b33b36e7","lastAttemptedRevision":"6.2.0/79f81383288bf6542fcb5bdd8144b826b33b36e7","observedGeneration":1}}',
136136
clusterName: "Default",
137137
},
138138
};

0 commit comments

Comments
 (0)