UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit f099d249 authored by Aaron Warner's avatar Aaron Warner
Browse files

Merge branch '2.6.3' into 'development'

2.6.3 init

See merge request dsop/confluent/confluentinc/confluent-operator-2.6.x!22
parents ad30ea85 bc95fb73
Branches test_vat_120723
No related tags found
2 merge requests!23Development,!222.6.3 init
Pipeline #2557579 passed
Pipeline: confluent-operator-2.9.x

#2557580

    ARG CONFLUENT_OPERATOR_BASE_IMAGE=confluentinc/confluent-operator ARG CONFLUENT_OPERATOR_BASE_IMAGE=confluentinc/confluent-operator
    ARG CONFLUENT_OPERATOR_BASE_TAG=0.771.45 ARG CONFLUENT_OPERATOR_BASE_TAG=0.771.62
    ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_REGISTRY=registry1.dso.mil
    ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_IMAGE=redhat/ubi/ubi8
    ......
    ...@@ -8,15 +8,15 @@ name: "confluentinc/confluent-operator" ...@@ -8,15 +8,15 @@ name: "confluentinc/confluent-operator"
    # The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
    # on ironbank.dso.mil # on ironbank.dso.mil
    tags: tags:
    - "2.6.2" - "2.6.3"
    - "2.6" - "2.6"
    - "0.771.45" - "0.771.62"
    - "0.771" - "0.771"
    # Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
    args: args:
    CONFLUENT_OPERATOR_BASE_IMAGE: "confluentinc/confluent-operator" CONFLUENT_OPERATOR_BASE_IMAGE: "confluentinc/confluent-operator"
    CONFLUENT_OPERATOR_BASE_TAG: "0.771.45" CONFLUENT_OPERATOR_BASE_TAG: "0.771.62"
    BASE_IMAGE: "redhat/ubi/ubi8" BASE_IMAGE: "redhat/ubi/ubi8"
    BASE_TAG: "8.8" BASE_TAG: "8.8"
    ...@@ -27,14 +27,14 @@ labels: ...@@ -27,14 +27,14 @@ labels:
    org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE" org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
    org.opencontainers.image.url: "https://docs.confluent.io/current/installation/operator/index.html" org.opencontainers.image.url: "https://docs.confluent.io/current/installation/operator/index.html"
    org.opencontainers.image.vendor: "Confluent" org.opencontainers.image.vendor: "Confluent"
    org.opencontainers.image.version: "0.771.45" org.opencontainers.image.version: "0.771.62"
    mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator" mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
    mil.dso.ironbank.image.type: "commercial" mil.dso.ironbank.image.type: "commercial"
    mil.dso.ironbank.product.name: "Confluent Platform" mil.dso.ironbank.product.name: "Confluent Platform"
    resources: resources:
    - tag: confluentinc/confluent-operator:0.771.45 - tag: confluentinc/confluent-operator:0.771.62
    url: docker://docker.io/confluentinc/confluent-operator:0.771.45 url: docker://docker.io/confluentinc/confluent-operator:0.771.62
    # List of project maintainers # List of project maintainers
    maintainers: maintainers:
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment