diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..435b0c4 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,25 @@ +name: Release Charts + +on: + push: + branches: + - main + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.5.0 + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/Chart.yaml b/Chart.yaml index b3be3cb..f2d96a5 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,16 +15,16 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.0.1" +appVersion: "1.21.0" dependencies: - name: rabbitmq version: 11.2.2 repository: https://charts.bitnami.com/bitnami - condition: useRabbitMq \ No newline at end of file + condition: useRabbitMq diff --git a/templates/diffgram_settings.tpl b/templates/diffgram_settings.tpl index 5dde611..e63a5ea 100644 --- a/templates/diffgram_settings.tpl +++ b/templates/diffgram_settings.tpl @@ -52,7 +52,6 @@ KEY_CLOAK_MASTER_USER: {{.Values.diffgramSettings.KEY_CLOAK_MASTER_USER}} KEY_CLOAK_DIFFGRAM_USER: {{.Values.diffgramSettings.KEY_CLOAK_DIFFGRAM_USER}} KEYCLOAK_REALM: {{.Values.diffgramSettings.KEYCLOAK_REALM}} - KEYCLOAK_REALM: {{.Values.diffgramSettings.KEYCLOAK_REALM}} SMTP_HOST: {{.Values.diffgramSettings.SMTP_HOST}} SMTP_PORT: {{.Values.diffgramSettings.SMTP_PORT}} SMTP_USERNAME: {{.Values.diffgramSettings.SMTP_USERNAME}} diff --git a/templates/diffgrams_secrets.tpl b/templates/diffgrams_secrets.tpl index 76bfcd5..4429fb8 100644 --- a/templates/diffgrams_secrets.tpl +++ b/templates/diffgrams_secrets.tpl @@ -16,7 +16,7 @@ DATABASE_URL: "postgresql+psycopg2://{{ .Values.dbSettings.dbUser }}:{{ .Values.dbSettings.dbPassword }}@postgres-rds-service/{{ .Values.dbSettings.dbName }}" {{ end }} {{ if eq .Values.dbSettings.dbProvider "azure"}} - DATABASE_URL: "postgresql+psycopg2://{{ .Values.dbSettings.dbUser }}:{{ .Values.dbSettings.dbPassword }}@postgres-azure-service/{{ .Values.dbSettings.dbName }}" + DATABASE_URL: "postgresql+psycopg2://{{ .Values.dbSettings.dbUser }}:{{ .Values.dbSettings.dbPassword }}@{{ .Values.dbSettings.dbName }}" {{ end }} USER_PASSWORDS_SECRET: {{ .Values.diffgramSecrets.USER_PASSWORDS_SECRET }} DIFFGRAM_AZURE_CONNECTION_STRING: {{ .Values.diffgramSecrets.DIFFGRAM_AZURE_CONNECTION_STRING }} diff --git a/templates/hooks/database_pre_install.yaml b/templates/hooks/database_pre_install.yaml index 1f3c7fe..81377ab 100644 --- a/templates/hooks/database_pre_install.yaml +++ b/templates/hooks/database_pre_install.yaml @@ -57,4 +57,4 @@ spec: - secretRef: name: db-migrations-secret # The actual migrations command - command: ["sh","-c", "cd shared; export PYTHONPATH=/app; pip install sqlalchemy-utils==0.36.6;python /app/play_and_scripts/scripts/create_database.py; alembic upgrade head"] \ No newline at end of file + command: ["sh","-c", "cd shared; export PYTHONPATH=/app; pip install sqlalchemy-utils==0.41.1;python /app/play_and_scripts/scripts/create_database.py; alembic upgrade head"] \ No newline at end of file diff --git a/templates/hooks/database_pre_upgrade.yaml b/templates/hooks/database_pre_upgrade.yaml index 81d0c6f..9ce104e 100644 --- a/templates/hooks/database_pre_upgrade.yaml +++ b/templates/hooks/database_pre_upgrade.yaml @@ -47,7 +47,7 @@ spec: - secretRef: name: db-migrations-secret # The actual migrations command - command: ["sh","-c", "cd shared; export PYTHONPATH=/app; pip install sqlalchemy-utils==0.36.6;python /app/play_and_scripts/scripts/create_database.py; alembic upgrade head"] + command: ["sh","-c", "cd shared; export PYTHONPATH=/app; alembic upgrade head"] {{ if .Values.nodeGroupLabel }} nodeSelector: diff --git a/templates/ingress.yaml b/templates/ingress.yaml index 065dbce..035dda7 100644 --- a/templates/ingress.yaml +++ b/templates/ingress.yaml @@ -37,8 +37,6 @@ spec: tls: - hosts: - {{ .Values.diffgramDomain }} - - www.{{ .Values.diffgramDomain }} - - rabbitmq.{{ .Values.diffgramDomain}} secretName: diffgram-cert-tls-{{ .Values.diffgramDomain }} {{ end }} rules: diff --git a/values.yaml b/values.yaml index f4bcd58..26b848e 100644 --- a/values.yaml +++ b/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. # The Diffgram Version. Whenever a new update arrives, this will be changed. -diffgramVersion: 1.12.0 +diffgramVersion: 1.17.5 # Set this to your public domain where you want diffgram to be. # This must be a domain name and not a public IP address. @@ -17,7 +17,7 @@ useCertManager: true useTls: true tlsIssuer: letsencrypt-prod # One of: "issuer-local", "letsencrypt-staging", or "letsencrypt-prod" localCaSecretName: my-local-ca-key-pair -issuerEmail: pablo.estrada@diffgram.com +issuerEmail: anthony@diffgram.com dbSettings: # Specify How the DB Service should be created @@ -146,8 +146,8 @@ rabbitmq: autoGenerated: true resources: requests: - cpu: "1.0" - memory: "1G" + cpu: ".2" + memory: ".4G" limits: cpu: "1.0" memory: "1G" @@ -171,8 +171,8 @@ defaultService: eventHandlersService: numReplicas: 1 requests: - cpu: "1.0" - memory: "1G" + cpu: ".2" + memory: ".4G" limits: cpu: "1.0" memory: "1G" @@ -181,8 +181,8 @@ eventHandlersService: frontendService: numReplicas: 1 requests: - cpu: "1.0" - memory: "1G" + cpu: ".2" + memory: ".4G" limits: cpu: "1.0" memory: "1G" @@ -192,7 +192,7 @@ walrusService: numReplicas: 1 requests: cpu: "1.0" - memory: "1G" + memory: "2G" limits: cpu: "2.0" - memory: "2G" + memory: "4G"