rebase fixes

cryostatio · Apr 17, 2024 · f62f2c8 · f62f2c8
1 parent 7d783a2
commit f62f2c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 57 deletions.
diff --git a/config/crd/bases/operator.cryostat.io_cryostats.yaml b/config/crd/bases/operator.cryostat.io_cryostats.yaml
@@ -27,9 +27,8 @@ spec:
       openAPIV3Schema:
         description: Cryostat allows you to install Cryostat for a single namespace.
           It contains configuration options for controlling the Deployment of the
-          Cryostat application and its related components. A ClusterCryostat or Cryostat
-          instance must be created to instruct the operator to deploy the Cryostat
-          application.
+          Cryostat application and its related components. A Cryostat instance must
+          be created to instruct the operator to deploy the Cryostat application.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -5129,28 +5128,6 @@ spec:
           spec:
             description: CryostatSpec defines the desired state of Cryostat.
             properties:
-              authProperties:
-                description: Override default authorization properties for Cryostat
-                  on OpenShift.
-                properties:
-                  clusterRoleName:
-                    description: 'Name of the ClusterRole to use when Cryostat requests
-                      a role-scoped OAuth token. This ClusterRole should contain permissions
-                      for all Kubernetes objects listed in custom permission mapping.
-                      More details: https://docs.openshift.com/container-platform/4.11/authentication/tokens-scoping.html#scoping-tokens-role-scope_configuring-internal-oauth'
-                    type: string
-                  configMapName:
-                    description: Name of config map in the local namespace.
-                    type: string
-                  filename:
-                    description: Filename within config map containing the resource
-                      mapping.
-                    type: string
-                required:
-                - clusterRoleName
-                - configMapName
-                - filename
-                type: object
               enableCertManager:
                 description: Use cert-manager to secure in-cluster communication between
                   Cryostat components. Requires cert-manager to be installed.
@@ -8665,7 +8642,7 @@ spec:
                         type: object
                     type: object
                   databaseSecurityContext:
-                    description: Security Context to apply to the storage container.
+                    description: Security Context to apply to the database container.
                     properties:
                       allowPrivilegeEscalation:
                         description: 'AllowPrivilegeEscalation controls whether a

diff --git a/internal/test/resources.go b/internal/test/resources.go
@@ -907,7 +907,7 @@ func (r *TestResources) NewDatabaseSecret() *corev1.Secret {
 		},
 		StringData: map[string]string{
 			"CONNECTION_KEY": "credentials_database", // notsecret
-			"ENCRYPTION_KEY": "encryption_key", // notsecret
+			"ENCRYPTION_KEY": "encryption_key",       // notsecret
 		},
 	}
 }
@@ -932,7 +932,7 @@ func (r *TestResources) OtherDatabaseSecret() *corev1.Secret {
 		},
 		StringData: map[string]string{
 			"CONNECTION_KEY": "other-pass", // notsecret
-			"ENCRYPTION_KEY": "other-key", // notsecret
+			"ENCRYPTION_KEY": "other-key",  // notsecret
 		},
 	}
 }
@@ -957,7 +957,7 @@ func (r *TestResources) OtherJMXSecret() *corev1.Secret {
 		},
 		StringData: map[string]string{
 			"CRYOSTAT_RJMX_USER": "not-cryostat", // notsecret
-			"CRYOSTAT_RJMX_PASS": "other-pass", // notsecret
+			"CRYOSTAT_RJMX_PASS": "other-pass",   // notsecret
 		},
 	}
 }
@@ -1386,34 +1386,6 @@ func (r *TestResources) NewCoreEnvironmentVariables(reportsUrl string, ingress b
 
 func (r *TestResources) newNetworkEnvironmentVariables() []corev1.EnvVar {
 	envs := []corev1.EnvVar{}
-	if !r.Minimal {
-		if r.ExternalTLS {
-			envs = append(envs,
-				corev1.EnvVar{
-					Name:  "GRAFANA_DASHBOARD_EXT_URL",
-					Value: fmt.Sprintf("https://%s-grafana.example.com", r.Name),
-				})
-		} else {
-			envs = append(envs,
-				corev1.EnvVar{
-					Name:  "GRAFANA_DASHBOARD_EXT_URL",
-					Value: fmt.Sprintf("http://%s-grafana.example.com", r.Name),
-				})
-		}
-		if r.TLS {
-			envs = append(envs,
-				corev1.EnvVar{
-					Name:  "GRAFANA_DASHBOARD_URL",
-					Value: "https://cryostat-health.local:3000",
-				})
-		} else {
-			envs = append(envs,
-				corev1.EnvVar{
-					Name:  "GRAFANA_DASHBOARD_URL",
-					Value: "http://cryostat-health.local:3000",
-				})
-		}
-	}
 	return envs
 }