Skip to content

Commit

Permalink
Merge pull request #90 from hybrid-cloud-patterns/update-common
Browse files Browse the repository at this point in the history
Update common
  • Loading branch information
mbaldessari committed Aug 1, 2023
2 parents 057001f + 3444d34 commit a246609
Show file tree
Hide file tree
Showing 26 changed files with 105 additions and 426 deletions.
3 changes: 3 additions & 0 deletions common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ load-iib: ## CI target to install Index Image Bundles
for IIB in $(shell echo $(INDEX_IMAGES) | tr ',' '\n'); do \
INDEX_IMAGE="$${IIB}" ansible-playbook common/ansible/playbooks/iib-ci/iib-ci.yaml; \
done; \
else \
echo "No INDEX_IMAGES defined. Bailing out"; \
exit 1; \
fi


Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion common/hashicorp-vault/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ name: hashicorp-vault
version: 0.0.1
dependencies:
- name: vault
version: "0.24.1"
version: "0.25.0"
repository: "https://helm.releases.hashicorp.com"
Binary file removed common/hashicorp-vault/charts/vault-0.24.1.tgz
Binary file not shown.
Binary file added common/hashicorp-vault/charts/vault-0.25.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion common/hashicorp-vault/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ vault:
termination: "reencrypt"
image:
repository: "registry.connect.redhat.com/hashicorp/vault"
tag: "1.13.1-ubi"
tag: "1.14.0-ubi"
Original file line number Diff line number Diff line change
Expand Up @@ -8140,25 +8140,6 @@ rules:
- "update"
- "patch"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: view-pods
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
rules:
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
---
# Source: golang-external-secrets/charts/external-secrets/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand All @@ -8180,25 +8161,6 @@ subjects:
name: golang-external-secrets
namespace: "default"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: view-pods-rb
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
subjects:
- kind: ServiceAccount
name: vault
namespace: vault
apiGroup: ""
roleRef:
kind: Role
name: view-pods
apiGroup: rbac.authorization.k8s.io
---
# Source: golang-external-secrets/charts/external-secrets/templates/webhook-service.yaml
apiVersion: v1
kind: Service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8140,25 +8140,6 @@ rules:
- "update"
- "patch"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: view-pods
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
rules:
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
---
# Source: golang-external-secrets/charts/external-secrets/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand All @@ -8180,25 +8161,6 @@ subjects:
name: golang-external-secrets
namespace: "default"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: view-pods-rb
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
subjects:
- kind: ServiceAccount
name: vault
namespace: vault
apiGroup: ""
roleRef:
kind: Role
name: view-pods
apiGroup: rbac.authorization.k8s.io
---
# Source: golang-external-secrets/charts/external-secrets/templates/webhook-service.yaml
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -8396,32 +8358,6 @@ spec:
secret:
secretName: golang-external-secrets-webhook
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-presync.yaml
apiVersion: batch/v1
kind: Job
metadata:
annotations:
argocd.argoproj.io/hook: PreSync
name: job-wait-for-vault
# By placing the job in the vault namespace we can avoid dealing with RBACs
namespace: vault
spec:
template:
spec:
containers:
- image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
command:
- /bin/bash
- -c
- |
oc wait --for=condition=Ready=true pods -n vault vault-0 --timeout=900s
name: wait-for-healthy-vault
dnsPolicy: ClusterFirst
restartPolicy: Never
serviceAccount: vault
serviceAccountName: vault
terminationGracePeriodSeconds: 60
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-secretstore.yaml
apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8140,25 +8140,6 @@ rules:
- "update"
- "patch"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: view-pods
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
rules:
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
---
# Source: golang-external-secrets/charts/external-secrets/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand All @@ -8180,25 +8161,6 @@ subjects:
name: golang-external-secrets
namespace: "default"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: view-pods-rb
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
subjects:
- kind: ServiceAccount
name: vault
namespace: vault
apiGroup: ""
roleRef:
kind: Role
name: view-pods
apiGroup: rbac.authorization.k8s.io
---
# Source: golang-external-secrets/charts/external-secrets/templates/webhook-service.yaml
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -8396,32 +8358,6 @@ spec:
secret:
secretName: golang-external-secrets-webhook
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-presync.yaml
apiVersion: batch/v1
kind: Job
metadata:
annotations:
argocd.argoproj.io/hook: PreSync
name: job-wait-for-vault
# By placing the job in the vault namespace we can avoid dealing with RBACs
namespace: vault
spec:
template:
spec:
containers:
- image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
command:
- /bin/bash
- -c
- |
oc wait --for=condition=Ready=true pods -n vault vault-0 --timeout=900s
name: wait-for-healthy-vault
dnsPolicy: ClusterFirst
restartPolicy: Never
serviceAccount: vault
serviceAccountName: vault
terminationGracePeriodSeconds: 60
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-secretstore.yaml
apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
Expand Down
64 changes: 0 additions & 64 deletions common/tests/golang-external-secrets-naked.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8140,25 +8140,6 @@ rules:
- "update"
- "patch"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: view-pods
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
rules:
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
---
# Source: golang-external-secrets/charts/external-secrets/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand All @@ -8180,25 +8161,6 @@ subjects:
name: golang-external-secrets
namespace: "default"
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-vault-rbac-rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: view-pods-rb
namespace: vault
annotations:
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/sync-wave: "-15"
subjects:
- kind: ServiceAccount
name: vault
namespace: vault
apiGroup: ""
roleRef:
kind: Role
name: view-pods
apiGroup: rbac.authorization.k8s.io
---
# Source: golang-external-secrets/charts/external-secrets/templates/webhook-service.yaml
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -8396,32 +8358,6 @@ spec:
secret:
secretName: golang-external-secrets-webhook
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-presync.yaml
apiVersion: batch/v1
kind: Job
metadata:
annotations:
argocd.argoproj.io/hook: PreSync
name: job-wait-for-vault
# By placing the job in the vault namespace we can avoid dealing with RBACs
namespace: vault
spec:
template:
spec:
containers:
- image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
command:
- /bin/bash
- -c
- |
oc wait --for=condition=Ready=true pods -n vault vault-0 --timeout=900s
name: wait-for-healthy-vault
dnsPolicy: ClusterFirst
restartPolicy: Never
serviceAccount: vault
serviceAccountName: vault
terminationGracePeriodSeconds: 60
---
# Source: golang-external-secrets/templates/golang-external-secrets-hub-secretstore.yaml
apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
Expand Down
Loading

0 comments on commit a246609

Please sign in to comment.