Wolfgang Kulhanek
2019-08-13 936675d074495089c89a33e08a4910557a180f25
Added support for update interval. Added default requests/limits for operator pod.
3 files modified
44 ■■■■■ changed files
ansible/roles/ocp4-workload-quay-operator/defaults/main.yml 2 ●●●●● patch | view | raw | blame | history
ansible/roles/ocp4-workload-quay-operator/templates/operator.j2 41 ●●●●● patch | view | raw | blame | history
ansible/roles/ocp4-workload-quay-operator/templates/quay.j2 1 ●●●● patch | view | raw | blame | history
ansible/roles/ocp4-workload-quay-operator/defaults/main.yml
@@ -11,6 +11,8 @@
# Enable Clair
_quay_clair_enabled: True
# Clair Update Interval (Default 6h)
_quay_clair_update_interval: "10m"
# Access Credentials for Quay.io to pull Red Hat Quay
# Should be overwritten via base64 encoded Global Variables !!!
ansible/roles/ocp4-workload-quay-operator/templates/operator.j2
@@ -15,20 +15,27 @@
    spec:
      serviceAccountName: quay-operator
      containers:
        - name: quay-operator
          image: "{{ _quay_operator_image }}:{{ _quay_operator_image_tag }}"
          ports:
          - containerPort: 60000
            name: metrics
          imagePullPolicy: Always
          env:
            - name: WATCH_NAMESPACE
              valueFrom:
                fieldRef:
                  fieldPath: metadata.namespace
            - name: POD_NAME
              valueFrom:
                fieldRef:
                  fieldPath: metadata.name
            - name: OPERATOR_NAME
              value: "quay-operator"
      - name: quay-operator
        image: "{{ _quay_operator_image }}:{{ _quay_operator_image_tag }}"
        ports:
        - containerPort: 60000
          name: metrics
        imagePullPolicy: Always
        resources:
          limits:
            cpu: "200m"
            memory: 128Mi
          requests:
            cpu: "200m"
            memory: 128Mi
        env:
        - name: WATCH_NAMESPACE
          valueFrom:
            fieldRef:
              fieldPath: metadata.namespace
        - name: POD_NAME
          valueFrom:
            fieldRef:
              fieldPath: metadata.name
        - name: OPERATOR_NAME
          value: "quay-operator"
ansible/roles/ocp4-workload-quay-operator/templates/quay.j2
@@ -22,4 +22,5 @@
  clair:
    enabled: true
    imagePullSecretName: quay-pull-secret
    updateInterval: "{{ _quay_clair_update_interval }}"
{% endif %}