diff --git a/Makefile b/Makefile index d2fadb5c..7b46d3bc 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ # Generated by patternizer # This Makefile includes the common pattern targets from Makefile-common # You can add custom targets above or below the include line +export VP_SKIP_ARGO_HEALTHCHECK ?= true -include Makefile-common \ No newline at end of file +include Makefile-common diff --git a/Makefile-common b/Makefile-common index 29e34341..0ebf3e7a 100644 --- a/Makefile-common +++ b/Makefile-common @@ -18,8 +18,8 @@ operator-deploy operator-upgrade: ## Installs/updates the pattern on a cluster ( @$(ANSIBLE_RUN) rhvp.cluster_utils.operator_deploy .PHONY: install -#install: pattern-install ## Installs the pattern onto a cluster (Loads secrets as well if configured) -install: operator-deploy load-secrets +install: pattern-install ## Installs the pattern onto a cluster (Loads secrets as well if configured) + @$(ANSIBLE_RUN) rhvp.cluster_utils.install .PHONY: uninstall ## Prints a notice that patterns cannot currently be uninstalled uninstall: @@ -56,5 +56,5 @@ argo-healthcheck: ## Checks if all argo applications are synced ##@ Testing (CI) Tasks .PHONY: run-ci-tests -run-ci-tests: argo-healthcheck ## To run ci-tests, set any needed env vars +run-ci-tests: ## To run ci-tests, set any needed env vars @$(ANSIBLE_RUN) rhvp.cluster_utils.run_ci_tests diff --git a/docs/disconnected/mirror/images-imageset-config.yaml b/docs/disconnected/mirror/images-imageset-config.yaml index 1f097bb5..06d3962d 100644 --- a/docs/disconnected/mirror/images-imageset-config.yaml +++ b/docs/disconnected/mirror/images-imageset-config.yaml @@ -65,11 +65,13 @@ mirror: - name: registry.access.redhat.com/ubi9/skopeo:9.5-1745865345@sha256:d91eb0dac7308ddfb12193368a42009509925edba80da9ffd3b82d03427dc3ed # UBI used by cosign signing and RHTPA upload tasks - name: registry.access.redhat.com/ubi9/ubi:9.7-1764794285 + # HashiCorp Vault server (deployed by hashicorp-vault chart, namespace: vault) + - name: registry.connect.redhat.com/hashicorp/vault:2.1.2-ubi # Validated Patterns Helm charts (stored as OCI images) - name: quay.io/validatedpatterns/acm:0.2.11 # acm 0.2.* - name: quay.io/validatedpatterns/clustergroup:0.9.58 # clustergroup 0.9.* - - name: quay.io/validatedpatterns/hashicorp-vault:0.1.10 # hashicorp-vault 0.1.10 + - name: quay.io/validatedpatterns/hashicorp-vault:0.1.11 # hashicorp-vault 0.1.* - name: quay.io/validatedpatterns/ocp-certmanager:0.2.0 # ocp-certmanager 0.2.* - name: quay.io/validatedpatterns/ocp-compliance-scanning:0.0.3 # ocp-compliance-scanning 0.0.* - name: quay.io/validatedpatterns/openshift-external-secrets:0.0.4 # openshift-external-secrets 0.0.* diff --git a/values-coco-dev.yaml b/values-coco-dev.yaml index 8c9605c1..b871f19b 100644 --- a/values-coco-dev.yaml +++ b/values-coco-dev.yaml @@ -239,7 +239,7 @@ clusterGroup: namespace: vault argoProject: hub chart: hashicorp-vault - chartVersion: 0.1.10 + chartVersion: 0.1.* policies: [] jwt: enabled: true diff --git a/values-hub.yaml b/values-hub.yaml index f873d08a..0360ea84 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -369,7 +369,7 @@ clusterGroup: namespace: vault argoProject: hub chart: hashicorp-vault - chartVersion: 0.1.10 + chartVersion: 0.1.* extraValueFiles: - /overrides/values-vault-network-policy.yaml annotations: diff --git a/values-standalone.yaml b/values-standalone.yaml index 51b44f56..34fb4787 100644 --- a/values-standalone.yaml +++ b/values-standalone.yaml @@ -31,7 +31,7 @@ clusterGroup: namespace: vault argoProject: hub chart: hashicorp-vault - chartVersion: 0.1.10 + chartVersion: 0.1.* openshift-external-secrets: name: openshift-external-secrets namespace: external-secrets