Skip to content

Commit

Permalink
Merge branch 'master' into oscar2
Browse files Browse the repository at this point in the history
  • Loading branch information
catttam authored Jun 21, 2024
2 parents 98b0b47 + a95a677 commit 55c22b2
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 13 deletions.
2 changes: 1 addition & 1 deletion IM/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: IM
description: Deploy a HA Infrastructure Manager
version: 1.6.2
version: 1.6.3
type: application
home: https://www.grycap.upv.es/im
sources:
Expand Down
2 changes: 1 addition & 1 deletion IM/templates/im_lb_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
serviceAccountName: im-load-balancer
containers:
- name: haproxy-load-balancer
image: quay.io/jcmoraisjr/haproxy-ingress:v0.13.7
image: quay.io/jcmoraisjr/haproxy-ingress:v0.13.16
args:
- --default-backend-service=$(POD_NAMESPACE)/im-backend
- --configmap=$(POD_NAMESPACE)/haproxy-load-balancer
Expand Down
22 changes: 11 additions & 11 deletions IM/templates/im_lb_rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -63,7 +63,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -99,33 +99,33 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
subjects:
- kind: ServiceAccount
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
namespace: {{ .Release.Namespace }}
- apiGroup: rbac.authorization.k8s.io
kind: User
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
namespace: {{ .Release.Namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
subjects:
- kind: ServiceAccount
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
namespace: {{ .Release.Namespace }}
- apiGroup: rbac.authorization.k8s.io
kind: User
name: im-load-balancer
name: {{ .Release.Namespace }}-im-load-balancer
{{ end }}
Binary file added docs/IM-1.6.3.tgz
Binary file not shown.
32 changes: 32 additions & 0 deletions docs/index.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,38 @@
apiVersion: v1
entries:
IM:
- apiVersion: v2
created: "2024-05-30T09:20:51.777195091Z"
dependencies:
- name: mysql
repository: https://charts.helm.sh/stable
version: '>= 1.1.1'
- condition: vault.enabled
name: vault
repository: https://helm.releases.hashicorp.com
version: '>= 0.17.1'
- condition: mongodb.enabled
name: mongodb
repository: https://charts.bitnami.com/bitnami
version: '>= 12.1.31'
description: Deploy a HA Infrastructure Manager
digest: 8ef0b0e11cf354dfdcf616cc62aee552a5c8bc74a40a1ad7883b6e2db8aa4ef6
home: https://www.grycap.upv.es/im
icon: https://github.com/grycap/helm-charts/raw/master/icons/im.png
keywords:
- Infrastructure Manager
- Cloud Orchestrator
- TOSCA
maintainers:
- email: [email protected]
name: Miguel Caballer
name: IM
sources:
- https://github.com/grycap/im
type: application
urls:
- https://grycap.github.io/helm-charts/IM-1.6.3.tgz
version: 1.6.3
- apiVersion: v2
created: "2024-04-10T10:05:48.594751554Z"
dependencies:
Expand Down
File renamed without changes.

0 comments on commit 55c22b2

Please sign in to comment.