Merge pull request #123 from 3scale-ops/feat/deprecation-system-seeed…

…-metrics

Feat/Hard-deprecation of System seed and metrics custom resource fields

Makefile

@@ -1,6 +1,6 @@
 SHELL:=/bin/bash
 # Current Operator version
-VERSION ?= 0.10.7
+VERSION ?= 0.10.8
 # Default catalog image
 CATALOG_IMG ?= quay.io/3scaleops/saas-operator-bundle:catalog
 # Default bundle image tag

api/v1alpha1/system_types.go

@@ -248,10 +248,6 @@ type SystemConfig struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// +optional
 	ConfigFiles *ConfigFilesSpec `json:"configFiles,omitempty"`
-	// System seed
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// +optional
-	Seed SystemSeedSpec `json:"seed,omitempty"`
 	// DSN of system's main database
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	DatabaseDSN SecretReference `json:"databaseDSN"`
@@ -273,10 +269,6 @@ type SystemConfig struct {
 	// Options for Github integration
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	Github GithubSpec `json:"github"`
-	// Options for configuring metrics publication (will be deprecated on future releases)
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// +optional
-	Metrics MetricsSpec `json:"metrics,omitempty"`
 	// Options for configuring RH Customer Portal integration
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	RedHatCustomerPortal RedHatCustomerPortalSpec `json:"redhatCustomerPortal"`
@@ -347,37 +339,6 @@ func (cfs *ConfigFilesSpec) Enabled() bool {
 	return true
 }
 
-// SystemSeedSpec whatever this is
-type SystemSeedSpec struct {
-	// Master access token
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	MasterAccessToken SecretReference `json:"masterAccessToken"`
-	// Master domain
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	MasterDomain string `json:"masterDomain"`
-	// Master user
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	MasterUser SecretReference `json:"masterUser"`
-	// Master password
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	MasterPassword SecretReference `json:"masterPassword"`
-	// Admin access token
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	AdminAccessToken SecretReference `json:"adminAccessToken"`
-	// Admin user
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	AdminUser SecretReference `json:"adminUser"`
-	// Admin password
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	AdminPassword SecretReference `json:"adminPassword"`
-	// Admin email address
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	AdminEmail string `json:"adminEmail"`
-	// Tenant name
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	TenantName string `json:"tenantName"`
-}
-
 // SystemRecaptchaSpec holds recaptcha configurations
 type SystemRecaptchaSpec struct {
 	// Public key
@@ -411,16 +372,6 @@ type GithubSpec struct {
 	ClientSecret SecretReference `json:"clientSecret"`
 }
 
-// MetricsSpec has options to configure prometheus metrics
-type MetricsSpec struct {
-	// User name
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	User SecretReference `json:"user"`
-	// Password
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	Password SecretReference `json:"password"`
-}
-
 // RedHatCustomerPortalSpec has configuration for integration with
 // Red Hat Customer Portal
 type RedHatCustomerPortalSpec struct {

bundle/manifests/saas-operator.clusterserviceversion.yaml

@@ -528,7 +528,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/3scale/saas-operator
     support: Red Hat
-  name: saas-operator.v0.10.7
+  name: saas-operator.v0.10.8
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -2111,39 +2111,6 @@ spec:
       - description: Memcached servers
         displayName: Memcached Servers
         path: config.memcachedServers
-      - description: Options for configuring metrics publication (will be deprecated on future releases)
-        displayName: Metrics
-        path: config.metrics
-      - description: Password
-        displayName: Password
-        path: config.metrics.password
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.metrics.password.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.metrics.password.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.metrics.password.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.metrics.password.override
-      - description: User name
-        displayName: User
-        path: config.metrics.user
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.metrics.user.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.metrics.user.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.metrics.user.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.metrics.user.override
       - description: Rails configuration options for system components
         displayName: Rails
         path: config.rails
@@ -2243,108 +2210,6 @@ spec:
       - description: Override allows to directly specify a string value.
         displayName: Override
         path: config.secretKeyBase.override
-      - description: System seed
-        displayName: Seed
-        path: config.seed
-      - description: Admin access token
-        displayName: Admin Access Token
-        path: config.seed.adminAccessToken
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.seed.adminAccessToken.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.seed.adminAccessToken.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.seed.adminAccessToken.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.seed.adminAccessToken.override
-      - description: Admin email address
-        displayName: Admin Email
-        path: config.seed.adminEmail
-      - description: Admin password
-        displayName: Admin Password
-        path: config.seed.adminPassword
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.seed.adminPassword.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.seed.adminPassword.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.seed.adminPassword.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.seed.adminPassword.override
-      - description: Admin user
-        displayName: Admin User
-        path: config.seed.adminUser
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.seed.adminUser.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.seed.adminUser.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.seed.adminUser.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.seed.adminUser.override
-      - description: Master access token
-        displayName: Master Access Token
-        path: config.seed.masterAccessToken
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.seed.masterAccessToken.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.seed.masterAccessToken.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.seed.masterAccessToken.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.seed.masterAccessToken.override
-      - description: Master domain
-        displayName: Master Domain
-        path: config.seed.masterDomain
-      - description: Master password
-        displayName: Master Password
-        path: config.seed.masterPassword
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.seed.masterPassword.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.seed.masterPassword.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.seed.masterPassword.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.seed.masterPassword.override
-      - description: Master user
-        displayName: Master User
-        path: config.seed.masterUser
-      - description: VaultSecretReference is a reference to a secret stored in a Hashicorp Vault
-        displayName: From Vault
-        path: config.seed.masterUser.fromVault
-      - description: The Vault key of the secret
-        displayName: Key
-        path: config.seed.masterUser.fromVault.key
-      - description: The Vault path where the secret is located
-        displayName: Path
-        path: config.seed.masterUser.fromVault.path
-      - description: Override allows to directly specify a string value.
-        displayName: Override
-        path: config.seed.masterUser.override
-      - description: Tenant name
-        displayName: Tenant Name
-        path: config.seed.tenantName
       - description: Options for Segment integration
         displayName: Segment
         path: config.segment
@@ -2993,7 +2858,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/saas-operator:0.10.7
+                image: quay.io/3scale/saas-operator:0.10.8
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -3380,4 +3245,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.3scale.net/
-  version: 0.10.7
+  version: 0.10.8