Skip to content

Commit

Permalink
Merge branch 'main' into cert-transfer-v1
Browse files Browse the repository at this point in the history
  • Loading branch information
saltiyazan committed Dec 4, 2024
2 parents 203748a + 3698ce9 commit 5434be6
Show file tree
Hide file tree
Showing 32 changed files with 774 additions and 576 deletions.
16 changes: 16 additions & 0 deletions .github/.jira_sync_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
settings:
jira_project_key: "SMS"
status_mapping:
opened: Untriaged
closed: done
not_planned: rejected

components:
- traefik

add_gh_comment: false
sync_description: false
sync_comments: false

label_mapping:
"Type: Enhancement": Story
11 changes: 0 additions & 11 deletions .github/workflows/issues.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ jobs:
name: PR
uses: canonical/observability/.github/workflows/charm-pull-request.yaml@main
secrets: inherit

terraform-checks:
name: Terraform
uses: canonical/observability/.github/workflows/terraform-quality-checks.yaml@main
38 changes: 37 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,40 @@ tests/integration/testers/*/lib
# charmcraft bug: leaves the build folders behind after a pack.
**/parts/
**/prime/
**/stage/
**/stage/

# Local .terraform directories
**/.terraform/*

# .tfstate files
*.tfstate
*.tfstate.*

# Crash log files
crash.log
crash.*.log

# Exclude all .tfvars files, which are likely to contain sensitive data, such as
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# to change depending on the environment.
*.tfvars
*.tfvars.json

# Ignore override files as they are usually used to override resources locally and so
# are not checked in
override.tf
override.tf.json
*_override.tf
*_override.tf.json

# Include override files you do wish to add to version control using negated pattern
# !example_override.tf

# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
# example: *tfplan*

# Ignore CLI configuration files
.terraformrc
terraform.rc
.terraform.lock.hcl
3 changes: 3 additions & 0 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ options:
will provide to the unit `my-unit/2` in the `my-model` model the following URL:
`http://my-model-my-unit-2.foo:8080`
Note that, for 'subdomain' routing mode, the external_hostname must be set and not be set to an IP address. This
is because subdomains are not supported for IP addresses.
type: string
default: path

Expand Down
301 changes: 0 additions & 301 deletions lib/charms/observability_libs/v0/juju_topology.py

This file was deleted.

Loading

0 comments on commit 5434be6

Please sign in to comment.