Rename

Signed-off-by: Pavol Loffay <[email protected]>
jaegertracing · Mar 24, 2022 · 66c9063 · 66c9063
1 parent 66ed996
commit 66c9063
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/apis/v1/jaeger_types.go b/apis/v1/jaeger_types.go
@@ -538,7 +538,7 @@ type ElasticsearchSpec struct {
 	// This is a preferred setting for new Jaeger deployments on OCP versions newer than 4.6.
 	// The cert management feature was added to Red Hat Openshift logging 5.2 in OCP 4.7.
 	// +optional
-	UseESCertManagement *bool `json:"useESCertManagement,omitempty"`
+	UseCertManagement *bool `json:"useCertManagement,omitempty"`
 
 	// +optional
 	Image string `json:"image,omitempty"`

diff --git a/apis/v1/zz_generated.deepcopy.go b/apis/v1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/jaegertracing.io_jaegers.yaml b/bundle/manifests/jaegertracing.io_jaegers.yaml
@@ -9540,7 +9540,7 @@ spec:
                           type: object
                         type: array
                         x-kubernetes-list-type: atomic
-                      useESCertManagement:
+                      useCertManagement:
                         type: boolean
                     type: object
                   esIndexCleaner:

diff --git a/config/crd/bases/jaegertracing.io_jaegers.yaml b/config/crd/bases/jaegertracing.io_jaegers.yaml
@@ -9539,7 +9539,7 @@ spec:
                           type: object
                         type: array
                         x-kubernetes-list-type: atomic
-                      useESCertManagement:
+                      useCertManagement:
                         type: boolean
                     type: object
                   esIndexCleaner:

diff --git a/docs/api.md b/docs/api.md
@@ -37105,7 +37105,7 @@ Resource Types:
         </td>
         <td>false</td>
       </tr><tr>
-        <td><b>useESCertManagement</b></td>
+        <td><b>useCertManagement</b></td>
         <td>boolean</td>
         <td>
           <br/>

diff --git a/pkg/controller/jaeger/jaeger_controller.go b/pkg/controller/jaeger/jaeger_controller.go
@@ -217,8 +217,8 @@ func (r *ReconcileJaeger) apply(ctx context.Context, jaeger v1.Jaeger, str strat
 	// therefore running this here and not in the strategy
 	if v1.ShouldInjectOpenShiftElasticsearchConfiguration(jaeger.Spec.Storage) &&
 		// generate the certs only if cert management is disabled
-		(jaeger.Spec.Storage.Elasticsearch.UseESCertManagement == nil ||
-			*jaeger.Spec.Storage.Elasticsearch.UseESCertManagement == false) {
+		(jaeger.Spec.Storage.Elasticsearch.UseCertManagement == nil ||
+			*jaeger.Spec.Storage.Elasticsearch.UseCertManagement == false) {
 
 		opts := client.MatchingLabels(map[string]string{
 			"app.kubernetes.io/instance":   jaeger.Name,

diff --git a/pkg/storage/elasticsearch.go b/pkg/storage/elasticsearch.go
@@ -25,21 +25,21 @@ const (
 )
 
 func (ed *ElasticsearchDeployment) getCertPath() string {
-	if ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement {
+	if ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement {
 		return certPathESCertManagement
 	}
 	return certPath
 }
 
 func (ed *ElasticsearchDeployment) getCertKeyPath() string {
-	if ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement {
+	if ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement {
 		return keyPathESCertManagement
 	}
 	return keyPath
 }
 
 func (ed *ElasticsearchDeployment) getCertCaPath() string {
-	if ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement {
+	if ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement {
 		return caPathESCerManagement
 	}
 	return caPath
@@ -168,7 +168,7 @@ func (ed *ElasticsearchDeployment) Elasticsearch() *esv1.Elasticsearch {
 	}
 
 	annotations := map[string]string{}
-	if ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseESCertManagement == true {
+	if ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement != nil && *ed.Jaeger.Spec.Storage.Elasticsearch.UseCertManagement == true {
 		annotations["logging.openshift.io/elasticsearch-cert-management"] = "true"
 		// The value has to match searchguard configuration
 		// https://github.com/openshift/origin-aggregated-logging/blob/50126fb8e0c602e9c623d6a8599857aaf98f80f8/elasticsearch/sgconfig/roles_mapping.yml#L34
@@ -255,7 +255,7 @@ func jaegerESSecretName(jaeger v1.Jaeger) string {
 	prefix := ""
 	// ES cert management creates cert named jaeger-<elasticsearch-name>
 	// Cert management in Jaeger creates cert named <jaeger-name>-jaeger-elasticsearch
-	if jaeger.Spec.Storage.Elasticsearch.UseESCertManagement == nil || !*jaeger.Spec.Storage.Elasticsearch.UseESCertManagement {
+	if jaeger.Spec.Storage.Elasticsearch.UseCertManagement == nil || !*jaeger.Spec.Storage.Elasticsearch.UseCertManagement {
 		prefix = jaeger.Name + "-"
 	}
 	return fmt.Sprintf("%sjaeger-%s", prefix, jaeger.Spec.Storage.Elasticsearch.Name)

diff --git a/pkg/storage/elasticsearch_test.go b/pkg/storage/elasticsearch_test.go
@@ -72,9 +72,9 @@ func TestCreateElasticsearchCR(t *testing.T) {
 			name:      "foo",
 			namespace: "myproject",
 			jEsSpec: v1.ElasticsearchSpec{
-				Name:                "elasticsearch",
-				UseESCertManagement: &trueVar,
-				NodeCount:           1,
+				Name:              "elasticsearch",
+				UseCertManagement: &trueVar,
+				NodeCount:         1,
 			},
 			es: esv1.Elasticsearch{
 				ObjectMeta: metav1.ObjectMeta{
@@ -270,8 +270,8 @@ func TestInject(t *testing.T) {
 		},
 		{
 			es: v1.ElasticsearchSpec{
-				Name:                "elasticsearch",
-				UseESCertManagement: &trueVar,
+				Name:              "elasticsearch",
+				UseCertManagement: &trueVar,
 			},
 			pod: &corev1.PodSpec{
 				Containers: []corev1.Container{{
@@ -475,9 +475,9 @@ func TestInjectJobs(t *testing.T) {
 		{
 			name: "es-cert-management",
 			es: v1.ElasticsearchSpec{
-				Name:                "elasticsearch",
-				NodeCount:           3,
-				UseESCertManagement: &trueVar,
+				Name:              "elasticsearch",
+				NodeCount:         3,
+				UseCertManagement: &trueVar,
 			},
 			pod: &corev1.PodSpec{
 				Containers: []corev1.Container{{