Commit d027ac50 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

Add ConfigMap for skopeo configuration and update federation manager defaults...

Add ConfigMap for skopeo configuration and update federation manager defaults for artifact manager registry
parent 08de0f42
Loading
Loading
Loading
Loading
+20 −0
Changes for ansible/roles/artefact-manager/templates/artefact-manager.yaml.j2: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,17 @@ kind: Namespace
metadata:
  name: {{ artefact_manager_namespace }}
---
apiVersion: v1
kind: ConfigMap
metadata:
  name: skopeo-config
  namespace: {{ artefact_manager_namespace }}
data:
  registries.conf: |
    [[registry]]
    location = "{{ external_host_ip }}:{{ harbor_http_nodeport }}"
    insecure = true
---
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -34,6 +45,15 @@ spec:
          limits:
            cpu: "500m"
            memory: "512Mi"
        volumeMounts:
        - name: skopeo-config
          mountPath: /etc/containers/registries.conf
          subPath: registries.conf
      volumes:
      - name: skopeo-config
        configMap:
          name: skopeo-config

---
apiVersion: v1
kind: Service
+3 −0
Changes for ansible/roles/federation-manager-remote/defaults/main.yml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -47,3 +47,6 @@ remote_federation_manager_ecp_flavour_id: "default-flavour"
remote_federation_manager_am_host: "{{ external_host_ip }}"
remote_federation_manager_am_port: "{{ artefact_manager_nodeport }}"
remote_federation_manager_am_enabled: "true"
remote_federation_manager_am_dst_registry: "{{ external_host_ip }}:{{ harbor_http_nodeport }}"
remote_federation_manager_am_dst_username: "admin"
remote_federation_manager_am_dst_password: "Harbor12345"
+3 −0
Changes for ansible/roles/federation-manager/defaults/main.yml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -47,3 +47,6 @@ federation_manager_ecp_flavour_id: "default-flavour"
federation_manager_am_host: "{{ external_host_ip }}"
federation_manager_am_port: "{{ artefact_manager_nodeport }}"
federation_manager_am_enabled: "true"
federation_manager_am_dst_registry: "{{ external_host_ip }}:{{ harbor_http_nodeport }}"
federation_manager_am_dst_username: "admin"
federation_manager_am_dst_password: "Harbor12345"