Skip to content

Commit

Permalink
update vendor packages (#1959)
Browse files Browse the repository at this point in the history
* update vendor packages

* update scan image

* fix failing tests due to backport

* remove unneeded configs
  • Loading branch information
pgvishnuram committed Aug 21, 2023
1 parent f8ade0f commit 498bd65
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 30 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -337,14 +337,14 @@ workflows:
- quay.io/astronomer/ap-alertmanager:0.25.0
- quay.io/astronomer/ap-astro-ui:0.30.13
- quay.io/astronomer/ap-auth-sidecar:1.25.1
- quay.io/astronomer/ap-awsesproxy:1.3-12
- quay.io/astronomer/ap-awsesproxy:1.3-13
- quay.io/astronomer/ap-base:3.18.0-1
- quay.io/astronomer/ap-blackbox-exporter:0.23.0-4
- quay.io/astronomer/ap-blackbox-exporter:0.23.0-5
- quay.io/astronomer/ap-cli-install:0.26.17
- quay.io/astronomer/ap-commander:0.30.10
- quay.io/astronomer/ap-configmap-reloader:0.8.0
- quay.io/astronomer/ap-curator:7.0.0-4
- quay.io/astronomer/ap-db-bootstrapper:0.31.2
- quay.io/astronomer/ap-curator:7.0.0-6
- quay.io/astronomer/ap-db-bootstrapper:0.31.4
- quay.io/astronomer/ap-default-backend:0.28.18
- quay.io/astronomer/ap-elasticsearch-exporter:1.5.0
- quay.io/astronomer/ap-elasticsearch:7.17.10
Expand All @@ -354,19 +354,19 @@ workflows:
- quay.io/astronomer/ap-init:3.18.0
- quay.io/astronomer/ap-kibana:7.17.10
- quay.io/astronomer/ap-kube-state:2.8.2
- quay.io/astronomer/ap-nats-exporter:0.10.0-5
- quay.io/astronomer/ap-nats-server:2.8.4-3
- quay.io/astronomer/ap-nats-streaming:0.24.6-3
- quay.io/astronomer/ap-nats-exporter:0.10.0-6
- quay.io/astronomer/ap-nats-server:2.8.4-4
- quay.io/astronomer/ap-nats-streaming:0.24.6-4
- quay.io/astronomer/ap-nginx-es:1.25.1
- quay.io/astronomer/ap-nginx:1.7.0
- quay.io/astronomer/ap-node-exporter:1.5.0
- quay.io/astronomer/ap-openresty:1.21.4-9
- quay.io/astronomer/ap-pgbouncer-krb:1.17.0-7
- quay.io/astronomer/ap-postgres-exporter:0.12.0
- quay.io/astronomer/ap-pgbouncer-krb:1.17.0-9
- quay.io/astronomer/ap-postgres-exporter:0.12.0-1
- quay.io/astronomer/ap-postgresql:11.18.0-1
- quay.io/astronomer/ap-prometheus:2.45.0
- quay.io/astronomer/ap-registry:3.16.5
- quay.io/astronomer/ap-vector:0.28.2-1
- quay.io/astronomer/ap-registry:3.16.5-1
- quay.io/astronomer/ap-vector:0.28.2-3
context:
- slack_team-software-infra-bot

Expand Down
4 changes: 2 additions & 2 deletions charts/astronomer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ images:
pullPolicy: IfNotPresent
registry:
repository: quay.io/astronomer/ap-registry
tag: 3.16.5
tag: 3.16.5-1
pullPolicy: IfNotPresent
# httpSecret: ~
houston:
Expand All @@ -32,7 +32,7 @@ images:
pullPolicy: IfNotPresent
dbBootstrapper:
repository: quay.io/astronomer/ap-db-bootstrapper
tag: 0.31.2
tag: 0.31.4
pullPolicy: IfNotPresent
cliInstall:
repository: quay.io/astronomer/ap-cli-install
Expand Down
2 changes: 1 addition & 1 deletion charts/elasticsearch/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ images:
pullPolicy: IfNotPresent
curator:
repository: quay.io/astronomer/ap-curator
tag: 7.0.0-4
tag: 7.0.0-6
pullPolicy: IfNotPresent
exporter:
repository: quay.io/astronomer/ap-elasticsearch-exporter
Expand Down
2 changes: 1 addition & 1 deletion charts/external-es-proxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ images:
pullPolicy: IfNotPresent
awsproxy:
repository: quay.io/astronomer/ap-awsesproxy
tag: 1.3-12
tag: 1.3-13
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/grafana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ images:
pullPolicy: IfNotPresent
dbBootstrapper:
repository: quay.io/astronomer/ap-db-bootstrapper
tag: 0.31.2
tag: 0.31.4
pullPolicy: IfNotPresent

backendSecretName: ~
Expand Down
4 changes: 2 additions & 2 deletions charts/nats/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
images:
nats:
repository: quay.io/astronomer/ap-nats-server
tag: 2.8.4-3
tag: 2.8.4-4
pullPolicy: IfNotPresent
exporter:
repository: quay.io/astronomer/ap-nats-exporter
tag: 0.10.0-5
tag: 0.10.0-6
pullPolicy: IfNotPresent

nats:
Expand Down
2 changes: 1 addition & 1 deletion charts/pgbouncer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#############################
image:
repository: quay.io/astronomer/ap-pgbouncer-krb
tag: 1.17.0-7
tag: 1.17.0-9
pullPolicy: IfNotPresent

internalPort: 5432
Expand Down
2 changes: 1 addition & 1 deletion charts/prometheus-blackbox-exporter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ strategy:

image:
repository: quay.io/astronomer/ap-blackbox-exporter
tag: 0.23.0-4
tag: 0.23.0-5
pullPolicy: IfNotPresent

## Optionally specify an array of imagePullSecrets.
Expand Down
2 changes: 1 addition & 1 deletion charts/prometheus-postgres-exporter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replicaCount: 2

image:
repository: quay.io/astronomer/ap-postgres-exporter
tag: 0.12.0
tag: 0.12.0-1
pullPolicy: IfNotPresent

service:
Expand Down
4 changes: 2 additions & 2 deletions charts/stan/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ images:
pullPolicy: IfNotPresent
stan:
repository: quay.io/astronomer/ap-nats-streaming
tag: 0.24.6-3
tag: 0.24.6-4
pullPolicy: IfNotPresent
exporter:
repository: quay.io/astronomer/ap-nats-exporter
tag: 0.10.0-5
tag: 0.10.0-6
pullPolicy: IfNotPresent

stan:
Expand Down
15 changes: 9 additions & 6 deletions tests/chart_tests/test_default_chart.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
class TestAllPodSpecContainers:
"""Test pod spec containers for some defaults."""

default_docs = render_chart()
default_docs_trimmed = [doc for doc in default_docs if doc["kind"] in pod_managers]
chart_values = chart_tests.get_all_features()

default_docs = render_chart(values=chart_values)
pod_manager_docs = [doc for doc in default_docs if doc["kind"] in pod_managers]
annotated = [x for x in default_docs if x["metadata"].get("annotations")]

@pytest.mark.parametrize(
Expand All @@ -33,15 +35,16 @@ def test_annotation_keys_are_valid(self, doc):

@pytest.mark.parametrize(
"doc",
default_docs_trimmed,
ids=[f"{x['kind']}/{x['metadata']['name']}" for x in default_docs_trimmed],
pod_manager_docs,
ids=[f"{x['kind']}/{x['metadata']['name']}" for x in pod_manager_docs],
)
def test_default_chart_with_basedomain(self, doc):
"""Test that each container in each pod spec renders."""
"""Test that each container in each pod spec renders and has some
required fields."""
c_by_name = get_containers_by_name(doc, include_init_containers=True)
for name, container in c_by_name.items():
assert container["image"], f"container {name} does not have an image: {doc}"
assert container["imagePullPolicy"]
assert container["imagePullPolicy"] == "IfNotPresent"

private_repo = "example.com/the-private-registry-repository"
private_values = chart_tests.get_all_features()
Expand Down
2 changes: 1 addition & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ global:
loggingSidecar:
enabled: false
name: sidecar-log-consumer
image: quay.io/astronomer/ap-vector:0.28.2-1
image: quay.io/astronomer/ap-vector:0.28.2-3
customConfig: false
extraEnv: []
resources: {}
Expand Down

0 comments on commit 498bd65

Please sign in to comment.