Skip to content

Commit be3aaab

Browse files
committed
fix: add annotations to generator struct
Kustomize uses `internal.config.kubernetes.io` annotations when manifests are in flight. They started adding them to Helm manifests, so they need to be added to our struct to tolerate them. ref: https://redhat.atlassian.net/browse/ACM-32044 Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
1 parent 109345e commit be3aaab

2 files changed

Lines changed: 19 additions & 12 deletions

File tree

internal/plugin.go

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,16 @@ const (
4242
// Plugin is used to store the PolicyGenerator configuration and the methods to generate the
4343
// desired policies.
4444
type Plugin struct {
45-
APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
46-
Kind string `json:"kind,omitempty" yaml:"kind,omitempty"`
47-
Metadata struct {
48-
Name string `json:"name,omitempty" yaml:"name,omitempty"`
49-
} `json:"metadata,omitempty" yaml:"metadata,omitempty"`
50-
PlacementBindingDefaults struct {
51-
Name string `json:"name,omitempty" yaml:"name,omitempty"`
52-
} `json:"placementBindingDefaults,omitempty" yaml:"placementBindingDefaults,omitempty"`
53-
PolicyDefaults types.PolicyDefaults `json:"policyDefaults,omitempty" yaml:"policyDefaults,omitempty"`
54-
PolicySetDefaults types.PolicySetDefaults `json:"policySetDefaults,omitempty" yaml:"policySetDefaults,omitempty"`
55-
Policies []types.PolicyConfig `json:"policies" yaml:"policies"`
56-
PolicySets []types.PolicySetConfig `json:"policySets" yaml:"policySets"`
45+
APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
46+
Kind string `json:"kind,omitempty" yaml:"kind,omitempty"`
47+
Metadata types.Metadata `json:"metadata" yaml:"metadata"`
48+
49+
PlacementBindingDefaults types.PlacementBindingDefaults `json:"placementBindingDefaults" yaml:"placementBindingDefaults"`
50+
PolicyDefaults types.PolicyDefaults `json:"policyDefaults" yaml:"policyDefaults"`
51+
PolicySetDefaults types.PolicySetDefaults `json:"policySetDefaults" yaml:"policySetDefaults"`
52+
Policies []types.PolicyConfig `json:"policies" yaml:"policies"`
53+
PolicySets []types.PolicySetConfig `json:"policySets" yaml:"policySets"`
54+
5755
// A set of all placement names that have been processed or generated
5856
allPlcs map[string]bool
5957
// The base of the directory tree to restrict all manifest files to be within

internal/types/types.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,12 @@ type PolicyDependency struct {
160160
Name string `json:"name" yaml:"name"`
161161
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
162162
}
163+
164+
type PlacementBindingDefaults struct {
165+
Name string `json:"name,omitempty" yaml:"name,omitempty"`
166+
}
167+
168+
type Metadata struct {
169+
Name string `json:"name,omitempty" yaml:"name,omitempty"`
170+
Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
171+
}

0 commit comments

Comments
 (0)