UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 799bc937 authored by Austin Webster's avatar Austin Webster
Browse files

Merge branch '2.6.4' into 'development'

App Update 2.6.4

See merge request dsop/confluent/confluentinc/confluent-operator-2.6.x!25
parents f099d249 c0317252
No related branches found
No related tags found
2 merge requests!26Development,!25App Update 2.6.4
Pipeline #2664463 passed
Pipeline: confluent-operator-2.9.x

#2664476

    ARG CONFLUENT_OPERATOR_BASE_IMAGE=confluentinc/confluent-operator
    ARG CONFLUENT_OPERATOR_BASE_TAG=0.771.62
    ARG CONFLUENT_OPERATOR_BASE_TAG=0.771.68
    ARG BASE_REGISTRY=registry1.dso.mil
    ARG BASE_IMAGE=redhat/ubi/ubi8
    ARG BASE_TAG=8.8
    ARG BASE_TAG=8.9
    FROM ${CONFLUENT_OPERATOR_BASE_IMAGE}:${CONFLUENT_OPERATOR_BASE_TAG} as base
    FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
    ......
    ......@@ -8,17 +8,17 @@ name: "confluentinc/confluent-operator"
    # The most specific version should be the first tag and will be shown
    # on ironbank.dso.mil
    tags:
    - "2.6.3"
    - "2.6.4"
    - "2.6"
    - "0.771.62"
    - "0.771.68"
    - "0.771"
    # Build args passed to Dockerfile ARGs
    args:
    CONFLUENT_OPERATOR_BASE_IMAGE: "confluentinc/confluent-operator"
    CONFLUENT_OPERATOR_BASE_TAG: "0.771.62"
    CONFLUENT_OPERATOR_BASE_TAG: "0.771.68"
    BASE_IMAGE: "redhat/ubi/ubi8"
    BASE_TAG: "8.8"
    BASE_TAG: "8.9"
    # Docker image labels
    labels:
    ......@@ -27,14 +27,14 @@ labels:
    org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
    org.opencontainers.image.url: "https://docs.confluent.io/current/installation/operator/index.html"
    org.opencontainers.image.vendor: "Confluent"
    org.opencontainers.image.version: "0.771.62"
    org.opencontainers.image.version: "0.771.68"
    mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
    mil.dso.ironbank.image.type: "commercial"
    mil.dso.ironbank.product.name: "Confluent Platform"
    resources:
    - tag: confluentinc/confluent-operator:0.771.62
    url: docker://docker.io/confluentinc/confluent-operator:0.771.62
    - tag: confluentinc/confluent-operator:0.771.68
    url: docker://docker.io/confluentinc/confluent-operator:0.771.68
    # List of project 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