Merge pull request #992 from equinor/master

release Added json attribute to object properies (#991)
equinor · Nov 29, 2023 · b6b0791 · b6b0791
2 parents 42a261e + 89959b3
commit b6b0791
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/charts/radix-operator/Chart.yaml b/charts/radix-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.25.6
-appVersion: 1.45.6
+version: 1.25.7
+appVersion: 1.45.7
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

diff --git a/pkg/apis/deployment/ingress.go b/pkg/apis/deployment/ingress.go
@@ -18,7 +18,7 @@ import (
 
 // IngressConfiguration Holds all ingress annotation configurations
 type IngressConfiguration struct {
-	AnnotationConfigurations []AnnotationConfiguration `yaml:"configuration"`
+	AnnotationConfigurations []AnnotationConfiguration `json:"configuration" yaml:"configuration"`
 }
 
 // AnnotationConfiguration Holds annotations for a single configuration

diff --git a/pkg/apis/kube/secret_provider.go b/pkg/apis/kube/secret_provider.go
@@ -31,17 +31,17 @@ type stringArray struct {
 // SecretProviderClassParameterObject Object for SecretProviderClass parameters
 type SecretProviderClassParameterObject struct {
 	// Name. Name of the Azure Key Vault object
-	Name string `yaml:"objectName"`
+	Name string `json:"objectName" yaml:"objectName"`
 	// Type. Type of the Azure KeyVault object: secret, key, cert
-	Type string `yaml:"objectType"`
+	Type string `json:"objectType" yaml:"objectType"`
 	// Alias. Optional. Specify the filename of the object when written to disk. Defaults to objectName if not provided.
-	Alias string `yaml:"objectAlias,omitempty"`
+	Alias string `json:"objectAlias,omitempty" yaml:"objectAlias,omitempty"`
 	// Version. Optional. object versions, default to the latest if empty
-	Version string `yaml:"objectVersion,omitempty"`
+	Version string `json:"objectVersion,omitempty" yaml:"objectVersion,omitempty"`
 	// Format. Optional. The format of the Azure Key Vault object, supported types are pem and pfx. objectFormat: pfx is only supported with objectType: secret and PKCS12 or ECC certificates. Default format for certificates is pem.
-	Format string `yaml:"objectFormat,omitempty"`
+	Format string `json:"objectFormat,omitempty" yaml:"objectFormat,omitempty"`
 	// Encoding. Optional. Setting object encoding to base64 and object format to pfx will fetch and write the base64 decoded pfx binary
-	Encoding string `yaml:"objectEncoding,omitempty"`
+	Encoding string `json:"objectEncoding,omitempty" yaml:"objectEncoding,omitempty"`
 }
 
 // GetSecretProviderClass Gets secret provider class