Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Prepare Release 1.5.0 #254

Merged
merged 5 commits into from
Aug 26, 2024
Merged

feat: Prepare Release 1.5.0 #254

merged 5 commits into from
Aug 26, 2024

Conversation

IceS2
Copy link
Contributor

@IceS2 IceS2 commented Aug 26, 2024

  • Updated Versions to 1.5.0

Based on the git diff below, modified:

  • Add maxSize, minSize, initialSize, checkConnectionWhileIdle, checkConnectionOnBorrow, evictionInterval, minIdleTime to database configuration
  • Update elasticsearch batchSize` default value to 100
  • Update secretsManagerConfiguration comment
  • Add projectId configuration on secretsManagerConfiguration
  • Add templates on smtp configuration
  • Add cacheControl and pragma attributes to web configuration

TODO:

  • Add Limits configuration
  • Check the bindHost changes
diff --git a/conf/openmetadata.yaml b/conf/openmetadata.yaml
index cfc1095556..d24b2ee046 100644
--- a/conf/openmetadata.yaml
+++ b/conf/openmetadata.yaml
@@ -19,9 +19,11 @@ server:
   rootPath: '/api/*'
   applicationConnectors:
     - type: http
+      bindHost: ${SERVER_HOST:-0.0.0.0}
       port: ${SERVER_PORT:-8585}
   adminConnectors:
     - type: http
+      bindHost: ${SERVER_HOST:-0.0.0.0}
       port: ${SERVER_ADMIN_PORT:-8586}
 
 # Above configuration for running http is fine for dev and testing.
@@ -146,6 +148,13 @@ database:
   password: ${DB_USER_PASSWORD:-openmetadata_password}
   # the JDBC URL; the database is called openmetadata_db
   url: jdbc:${DB_SCHEME:-mysql}://${DB_HOST:-localhost}:${DB_PORT:-3306}/${OM_DATABASE:-openmetadata_db}?${DB_PARAMS:-allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC}
+  maxSize: ${DB_CONNECTION_POOL_MAX_SIZE:-50}
+  minSize: ${DB_CONNECTION_POOL_MIN_SIZE:-10}
+  initialSize: ${DB_CONNECTION_POOL_INITIAL_SIZE:-10}
+  checkConnectionWhileIdle: ${DB_CONNECTION_CHECK_CONNECTION_WHILE_IDLE:-true}
+  checkConnectionOnBorrow: ${DB_CONNECTION_CHECK_CONNECTION_ON_BORROW:-true}
+  evictionInterval: ${DB_CONNECTION_EVICTION_INTERVAL:-5 minutes}
+  minIdleTime: ${DB_CONNECTION_MIN_IDLE_TIME:-1 minute}
 
 migrationConfiguration:
   flywayPath: "./bootstrap/sql/migrations/flyway"
@@ -276,7 +285,7 @@ elasticsearch:
   connectionTimeoutSecs: ${ELASTICSEARCH_CONNECTION_TIMEOUT_SECS:-5}
   socketTimeoutSecs: ${ELASTICSEARCH_SOCKET_TIMEOUT_SECS:-60}
   keepAliveTimeoutSecs: ${ELASTICSEARCH_KEEP_ALIVE_TIMEOUT_SECS:-600}
-  batchSize: ${ELASTICSEARCH_BATCH_SIZE:-10}
+  batchSize: ${ELASTICSEARCH_BATCH_SIZE:-100}
   payLoadSize: ${ELASTICSEARCH_PAYLOAD_BYTES_SIZE:-10485760}   #max payLoadSize in Bytes
   searchIndexMappingLanguage : ${ELASTICSEARCH_INDEX_MAPPING_LANG:-EN}
   searchIndexFactoryClassName : org.openmetadata.service.search.SearchIndexFactory
@@ -331,7 +340,7 @@ fernetConfiguration:
   fernetKey: ${FERNET_KEY:-jJ/9sz0g0OHxsfxOoSfdFdmk3ysNmPRnH3TUAbz3IHA=}
 
 secretsManagerConfiguration:
-  secretsManager: ${SECRET_MANAGER:-db} # Possible values are "db", "managed-aws", "managed-aws-ssm"
+  secretsManager: ${SECRET_MANAGER:-db} # Possible values are "db", "managed-aws","aws", "managed-aws-ssm", "aws-ssm", "managed-azure-kv", "azure-kv", "in-memory", "gcp"
   prefix: ${SECRET_MANAGER_PREFIX:-""} # Define the secret key ID as /<prefix>/<clusterName>/<key>
   tags: ${SECRET_MANAGER_TAGS:-[]} # Add tags to the created resource. Format is `[key1:value1,key2:value2,...]`
 # it will use the default auth provider for the secrets' manager service if parameters are not set
@@ -345,6 +354,8 @@ secretsManagerConfiguration:
     clientSecret: ${OM_SM_CLIENT_SECRET:-""}
     tenantId: ${OM_SM_TENANT_ID:-""}
     vaultName: ${OM_SM_VAULT_NAME:-""}
+    ## For GCP
+    projectId: ${OM_SM_PROJECT_ID:-""}
 
 health:
   delayedShutdownHandlerEnabled: true
@@ -369,6 +380,12 @@ email:
   username: ${SMTP_SERVER_USERNAME:-""}
   password: ${SMTP_SERVER_PWD:-""}
   transportationStrategy: ${SMTP_SERVER_STRATEGY:-"SMTP_TLS"}
+  templates: ${TEMPLATES:-"openmetadata"}
+
+limits:
+  enable: ${LIMITS_ENABLED:-false}
+  className: ${LIMITS_CLASS_NAME:-"org.openmetadata.service.limits.DefaultLimits"}
+  limitsConfigFile: ${LIMITS_CONFIG_FILE:-""}
 
 web:
   uriPath: ${WEB_CONF_URI_PATH:-"/api"}
@@ -397,3 +414,6 @@ web:
   permission-policy:
     enabled: ${WEB_CONF_PERMISSION_POLICY_ENABLED:-false}
     option: ${WEB_CONF_PERMISSION_POLICY_OPTION:-""}
+  cache-control: ${WEB_CONF_CACHE_CONTROL:-""}
+  pragma: ${WEB_CONF_PRAGMA:-""}```

@IceS2 IceS2 marked this pull request as draft August 26, 2024 13:10
@@ -254,7 +262,7 @@ openmetadata:
secretKey: ""
secretsManager:
enabled: true
# Possible values are db, aws, aws-ssm, managed-aws, managed-aws-ssm, in-memory, managed-azure-kv, azure-kv
# Possible values are db, aws, aws-ssm, managed-aws, managed-aws-ssm, in-memory, managed-azure-kv, azure-kv, gcp
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the list of values informed anywhere else to provide what is really supported or not? Can I use a helm value as potato and it will eat it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use potato in every string field, we are not doing enum validations. A nice to have feature though :)

Copy link
Contributor

@tutte tutte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we skip the limits and templates settings for now?

@IceS2
Copy link
Contributor Author

IceS2 commented Aug 26, 2024

Can we skip the limits and templates settings for now?

Since templates's default is openmetadata and it is used as a behavioural switch between collate and openmetadata, we don't need to add that variable to openmetadata's helm charts -> Removed

charts/openmetadata/templates/_helpers.tpl Outdated Show resolved Hide resolved
Co-authored-by: Matias Puerta <matias@getcollate.io>
@IceS2 IceS2 marked this pull request as ready for review August 26, 2024 14:07
@IceS2 IceS2 merged commit 38a5c7e into main Aug 26, 2024
1 check passed
@IceS2 IceS2 deleted the feat/prepare-release-1-5-0 branch August 26, 2024 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants