Skip to content

Commit e2e6082

Browse files
merge main
2 parents ab282e6 + 8fa21ec commit e2e6082

20 files changed

+955
-421
lines changed

apis/config/deviation_types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ type ConfigDeviation struct {
5252
// Path of the config this deviation belongs to
5353
Path string `json:"path,omitempty" protobuf:"bytes,1,opt,name=path"`
5454
// DesiredValue is the desired value of the config belonging to the path
55-
DesiredValue string `json:"desiredValue,omitempty" protobuf:"bytes,2,opt,name=desiredValue"`
55+
DesiredValue *string `json:"desiredValue,omitempty" protobuf:"bytes,2,opt,name=desiredValue"`
5656
// CurrentValue defines the current value of the config belonging to the path
5757
// that is currently configured on the target
58-
CurrentValue string `json:"actualValue,omitempty" protobuf:"bytes,3,opt,name=actualValue"`
58+
CurrentValue *string `json:"actualValue,omitempty" protobuf:"bytes,3,opt,name=actualValue"`
5959
// Reason defines the reason of the deviation
6060
Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"`
6161
}
6262

63-
// DeviationStatus defines the observed state of Deviation
63+
// DeviationStatus defines the observed state of Deviationgit
6464
type DeviationStatus struct {
6565
// ConditionedStatus provides the status of the Readiness using conditions
6666
// if the condition is true the other attributes in the status are meaningful

apis/config/v1alpha1/config_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (r *Config) GetTargetNamespaceName() (*types.NamespacedName, error) {
139139
return nil, fmt.Errorf("no target namespece information found in labels")
140140
}
141141
return &types.NamespacedName{
142-
Name: targetName,
142+
Name: targetName,
143143
Namespace: targetNamespace,
144144
}, nil
145145
}

apis/config/v1alpha1/configblame_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ func BuildEmptyConfigBlame() *ConfigBlame {
4141
Kind: ConfigBlameKind,
4242
},
4343
}
44-
}
44+
}

apis/config/v1alpha1/deviation_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ type ConfigDeviation struct {
5252
// Path of the config this deviation belongs to
5353
Path string `json:"path,omitempty" protobuf:"bytes,1,opt,name=path"`
5454
// DesiredValue is the desired value of the config belonging to the path
55-
DesiredValue string `json:"desiredValue,omitempty" protobuf:"bytes,2,opt,name=desiredValue"`
55+
DesiredValue *string `json:"desiredValue,omitempty" protobuf:"bytes,2,opt,name=desiredValue"`
5656
// CurrentValue defines the current value of the config belonging to the path
5757
// that is currently configured on the target
58-
CurrentValue string `json:"actualValue,omitempty" protobuf:"bytes,3,opt,name=actualValue"`
58+
CurrentValue *string `json:"actualValue,omitempty" protobuf:"bytes,3,opt,name=actualValue"`
5959
// Reason defines the reason of the deviation
6060
Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"`
6161
}

apis/config/v1alpha1/generated.pb.go

Lines changed: 112 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/config/v1alpha1/running_config_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ func BuildEmptyRunningConfig() *RunningConfig {
4141
Kind: RunningConfigKind,
4242
},
4343
}
44-
}
44+
}

apis/config/v1alpha1/zz_generated.conversion.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/config/v1alpha1/zz_generated.deepcopy.go

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/config/zz_generated.deepcopy.go

Lines changed: 31 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)