Skip to content

Commit

Permalink
Fixed merge conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
rudimk committed Feb 22, 2024
2 parents f7b2b6d + 1b44bc3 commit b774731
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion addons/ecr-secrets-updater/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: ecr-secrets-updater
description: A Helm chart to update a Porter release's ECR secrets through a cronjob
type: application
version: 0.5.0
version: 0.6.0
appVersion: "0.1.0"
keywords:
- MISC
2 changes: 1 addition & 1 deletion addons/elasticache-redis/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ maintainers:
- name: Porter Technologies, Inc.
email: [email protected]
name: elasticache-redis
version: 0.0.0
version: 0.5.0
2 changes: 1 addition & 1 deletion addons/helm-revision-pruner/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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: 0.1.0
version: 0.6.0
# 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.
Expand Down
2 changes: 1 addition & 1 deletion addons/keda/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Event-based autoscaler for workloads on Kubernetes
kubeVersion: ">=v1.23.0-0"
# 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.
version: 0.3.0
version: 0.4.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 2.11.1
Expand Down
2 changes: 1 addition & 1 deletion addons/metabase/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Template for deploying Metabase onto Porter.
icon: https://pbs.twimg.com/profile_images/961380992727465985/4unoiuHt.jpg
name: metabase
type: application
version: 0.15.0
version: 0.16.0
keywords:
- APP
- ANALYITCS
2 changes: 1 addition & 1 deletion addons/rds-postgresql-aurora/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ maintainers:
- name: Porter Technologies, Inc.
email: [email protected]
name: rds-postgresql-aurora
version: 0.6.0
version: 0.14.0
2 changes: 1 addition & 1 deletion addons/rds-postgresql/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ maintainers:
- name: Porter Technologies, Inc.
email: [email protected]
name: rds-postgresql
version: '0.5.0'
version: '0.11.0'
2 changes: 1 addition & 1 deletion addons/tailscale-relay/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: tailscale-relay
icon: https://images.crunchbase.com/image/upload/c_lpad,h_170,w_170,f_auto,b_white,q_auto:eco,dpr_1/xkthebhmilwbyffilnfl
version: 0.11.0
version: 0.12.0
appVersion: v1.56.1
keywords:
- APP
Expand Down
2 changes: 1 addition & 1 deletion applications/job/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ keywords:
- job
name: job
type: application
version: 0.61.0
version: 0.71.0
2 changes: 1 addition & 1 deletion applications/web/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ keywords:
- web
name: web
type: application
version: 0.143.0
version: 0.164.0
2 changes: 1 addition & 1 deletion applications/worker/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ keywords:
- worker
name: worker
type: application
version: 0.67.0
version: 0.78.0

0 comments on commit b774731

Please sign in to comment.