Skip to content

Commit 8d70ef9

Browse files
jomkzjomkz
committed
Merge branch 'release_0012'
* Increment operator version to v0.0.12 * Update to latest version of ubi8 base image
2 parents 3f7ae88 + 64de105 commit 8d70ef9

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

‎build/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# RHEL 8 Universal Base Image created 2020-06-22T07:39:38.453712Z
2-
FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:45efa640a7a50ec490d22f4e48c8a6e4892ddfee7ebe58ae9453c870e3ad3e00
1+
# RHEL 8 Universal Base Image created 2020-06-25T19:42:34.833547Z
2+
FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:ab6ac16b2ba297db67e036ae279f166834e8d4e881da2fcbbcfd05b44f34d415
33

44
ENV OPERATOR=/usr/local/bin/argocd-operator \
55
USER_UID=1001 \

‎deploy/catalog_source.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata:
44
name: argocd-catalog
55
spec:
66
sourceType: grpc
7-
image: quay.io/jmckind/argocd-operator-registry@sha256:03d7a735c3f46055cd1041c78bff2e961b2786cb6430e545b6f3eae4e1d156a8
7+
image: quay.io/jmckind/argocd-operator-registry@sha256:58081ef9390278776bd69bafaaf9b8ee413ec071ad44ea4fb05d0de06b40f485
88
displayName: Argo CD Operators
99
publisher: Argo CD Community

‎deploy/olm-catalog/argocd-operator/0.0.12/argocd-operator.v.0.0.12.clusterserviceversion.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ metadata:
66
capabilities: Auto Pilot
77
categories: Integration & Delivery
88
certified: "false"
9-
containerImage: quay.io/jmckind/argocd-operator:issue_124
10-
createdAt: "2020-05-27 14:32:34"
9+
containerImage: quay.io/jmckind/argocd-operator@sha256:a0ca1a848bf19ae7ddad3c367f083c9713d0040317352e9a52633b4fbf2df1f0
10+
createdAt: "2020-07-15 15:23:47"
1111
description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
1212
repository: https://github.com/argoproj-labs/argocd-operator
1313
support: Argo CD
@@ -559,7 +559,7 @@ spec:
559559
fieldPath: metadata.name
560560
- name: OPERATOR_NAME
561561
value: argocd-operator
562-
image: quay.io/jmckind/argocd-operator:issue_124
562+
image: quay.io/jmckind/argocd-operator@sha256:a0ca1a848bf19ae7ddad3c367f083c9713d0040317352e9a52633b4fbf2df1f0
563563
imagePullPolicy: Always
564564
name: argocd-operator
565565
resources: {}

‎deploy/operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: argocd-operator
1616
containers:
1717
- name: argocd-operator
18-
image: quay.io/jmckind/argocd-operator@sha256:a472ee86bbd1ec8e98178c6283f8c748deb9fd9ac396207ff80623b926003faa
18+
image: quay.io/jmckind/argocd-operator@sha256:a0ca1a848bf19ae7ddad3c367f083c9713d0040317352e9a52633b4fbf2df1f0
1919
command:
2020
- argocd-operator
2121
imagePullPolicy: Always

‎deploy/registry/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# upstream-registry-builder v1.12.4
2-
FROM quay.io/operator-framework/upstream-registry-builder@sha256:8d392ab0587d5bcd19a40d60ac6bc8214e6b515605be3113edd01ea99ce95942 as builder
1+
# upstream-registry-builder v1.13.1
2+
FROM quay.io/operator-framework/upstream-registry-builder@sha256:8f5db34a1bf254d4f664e280c437e4d708eb54ded5b61597fa267d533ca394c0 as builder
33

44
COPY manifests manifests
55
RUN ./bin/initializer -o ./bundles.db

‎docs/reference/argocdexport.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Name | Default | Description
1313
[**Image**](#image) | `quay.io/jmckind/argocd-operator-util` | The container image for the export Job.
1414
[**Schedule**](#schedule) | [Empty] | Export schedule in Cron format, see https://en.wikipedia.org/wiki/Cron.
1515
[**Storage**](#storage-options) | [Object] | The storage configuration options.
16-
[**Version**](#version) | v0.0.11 (SHA) | The tag to use with the container image for the export Job.
16+
[**Version**](#version) | v0.0.12 (SHA) | The tag to use with the container image for the export Job.
1717

1818
## Argocd
1919

@@ -116,5 +116,5 @@ metadata:
116116
labels:
117117
example: version
118118
spec:
119-
version: v0.0.11
119+
version: v0.0.12
120120
```

‎hack/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ source ${HACK_DIR}/env.sh
2323

2424
# Build the util container image
2525
echo "Building image ${ARGOCD_OPERATOR_UTIL_IMAGE}"
26-
${ARGOCD_OPERATOR_IMAGE_BUILDER} build -t ${ARGOCD_OPERATOR_UTIL_IMAGE} ${ARGOCD_OPERATOR_UTIL_BUILD_DIR}
26+
${ARGOCD_OPERATOR_IMAGE_BUILDER} build --no-cache -t ${ARGOCD_OPERATOR_UTIL_IMAGE} ${ARGOCD_OPERATOR_UTIL_BUILD_DIR}
2727

2828
# Push the util container image
2929
echo "Pushing image ${ARGOCD_OPERATOR_UTIL_IMAGE}"

‎pkg/common/defaults.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const (
8686
ArgoCDDefaultExportJobImage = "quay.io/jmckind/argocd-operator-util"
8787

8888
// ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified.
89-
ArgoCDDefaultExportJobVersion = "sha256:65292413bb82b280580884210bb6ce8de5ba1300c12d65db873719cc36914361" // v0.0.11
89+
ArgoCDDefaultExportJobVersion = "sha256:34cd8ddef3828246d0aff8d1eb4d1e30fad3b8186a95af06fc84190d09bcb083" // v0.0.12
9090

9191
// ArgoCDDefaultExportLocalCapicity is the default capacity to use for local export.
9292
ArgoCDDefaultExportLocalCapicity = "2Gi"

‎version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ package version
1616

1717
var (
1818
// Version is the ArgoCD Operator version.
19-
Version = "0.0.11"
19+
Version = "0.0.12"
2020
)

0 commit comments

Comments
 (0)