Skip to content

feat: use upstream settings for diff#939

Open
cwrau wants to merge 1 commit intodatabus23:masterfrom
cwrau:feat/adjust-dyff-settings
Open

feat: use upstream settings for diff#939
cwrau wants to merge 1 commit intodatabus23:masterfrom
cwrau:feat/adjust-dyff-settings

Conversation

@cwrau
Copy link
Contributor

@cwrau cwrau commented Feb 25, 2026

This way the diffs are more readable

This way the diffs are more readable
@yxxhero
Copy link
Collaborator

yxxhero commented Feb 26, 2026

@cwrau what's the difference?

@cwrau
Copy link
Contributor Author

cwrau commented Feb 26, 2026

@cwrau what's the difference?

For once, of course whitespace changes like the following;

- {"verdict":["DROPPED","ERROR"]}   + {"verdict":["DROPPED","ERROR"]}··

notice the ·· at the end indicating whitespace changes, aren't shown now.

Better k8s object detection (was true by default, but always specified upstream as well)

And similar names are detected via the DetectRenames, like if two resources have nearly the same name (happens often if you have hashes in the resource name like with ReplicaSets or other resources that are immutable but need to be "modified") it detects that (this is the core reason for this PR)

and instead of

(root level)  (infrastructure.cluster.x-k8s.io/v1beta1/OpenStackMachineTemplate/teuto-portal-clusters/1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-f32c22d2)
- one document removed:
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: OpenStackMachineTemplate
metadata:
  name: 1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-f32c22d2
  namespace: teuto-portal-clusters
  labels:
    app.kubernetes.io/instance: 1e3e22ce-6364-448e-85b9-d7a826cbd477
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/name: t8s-cluster
    helm.sh/chart: t8s-cluster-9.6.0
    helm.toolkit.fluxcd.io/name: 1e3e22ce-6364-448e-85b9-d7a826cbd477
    helm.toolkit.fluxcd.io/namespace: teuto-portal-clusters
spec:
  template:
    spec:
      flavor: standard.2.1905
      identityRef:
        name: 1e3e22ce-6364-448e-85b9-d7a826cbd477-cloud-config
        cloudName: openstack
      image:
        filter:
          name: placeholder
      securityGroups: []
      serverGroup:
        filter:
          name: control-plane

(root level)  (infrastructure.cluster.x-k8s.io/v1beta1/OpenStackMachineTemplate/teuto-portal-clusters/1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-74d64c12)
+ one document added:
---
# Source: t8s-cluster/templates/management-cluster/clusterClass/openStackMachineTemplates/openStackMachineTemplates.yaml
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: OpenStackMachineTemplate
metadata:
  name: 1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-74d64c12
  namespace: teuto-portal-clusters
  labels:
    app.kubernetes.io/name: t8s-cluster
    helm.sh/chart: t8s-cluster-9.5.2
    app.kubernetes.io/instance: 1e3e22ce-6364-448e-85b9-d7a826cbd477
    app.kubernetes.io/managed-by: Helm
spec:
  template:
    spec:
      flavor: standard.2.1905
      image:
        filter:
          name: placeholderr
      identityRef:
        name: 1e3e22ce-6364-448e-85b9-d7a826cbd477-cloud-config
        cloudName: openstack
      securityGroups: []
      serverGroup:
        filter:
          name: control-plane

it shows

metadata.name  (infrastructure.cluster.x-k8s.io/v1beta1/OpenStackMachineTemplate/teuto-portal-clusters/1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-74d64c12)
± value change
- 1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-f32c22d2
+ 1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-74d64c12

spec.template.spec.image.filter.name  (infrastructure.cluster.x-k8s.io/v1beta1/OpenStackMachineTemplate/teuto-portal-clusters/1e3e22ce-6364-448e-85b9-d7a826cbd477-control-plane-74d64c12)
± value change
- placeholder
+ placeholderr

@yxxhero
Copy link
Collaborator

yxxhero commented Feb 28, 2026

@cwrau are there any break changes?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants