Skip to content

Commit 22ded96

Browse files
reginapizzareginapizza
authored
Rebase master with 0.10.0 and 0.9.1 releases (#1403)
* argocd-operator v0.10.0 release (#1343) * fix typo in metadata (#1354) * update replaces version number for 0.10.0 to 0.9.1 (#1365) * update make deploy manifests * rebase with 0.9.1 * fix bundle manifest control plane * make bundle
1 parent e2a991b commit 22ded96

28 files changed

+73451
-11
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 0.9.0
6+
VERSION ?= 0.10.0
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

‎bundle/manifests/argocd-operator.clusterserviceversion.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ metadata:
252252
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
253253
repository: https://github.com/argoproj-labs/argocd-operator
254254
support: Argo CD
255-
name: argocd-operator.v0.9.0
255+
name: argocd-operator.v0.10.0
256256
namespace: placeholder
257257
spec:
258258
apiservicedefinitions: {}
@@ -1889,7 +1889,7 @@ spec:
18891889
fieldPath: metadata.annotations['olm.targetNamespaces']
18901890
- name: ENABLE_CONVERSION_WEBHOOK
18911891
value: "true"
1892-
image: quay.io/argoprojlabs/argocd-operator:v0.9.0
1892+
image: quay.io/argoprojlabs/argocd-operator:v0.10.0
18931893
livenessProbe:
18941894
httpGet:
18951895
path: /healthz
@@ -1979,8 +1979,8 @@ spec:
19791979
maturity: alpha
19801980
provider:
19811981
name: Argo CD Community
1982-
replaces: argocd-operator.v0.7.0
1983-
version: 0.9.0
1982+
replaces: argocd-operator.v0.9.1
1983+
version: 0.10.0
19841984
webhookdefinitions:
19851985
- admissionReviewVersions:
19861986
- v1alpha1

‎common/defaults.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ const (
122122
ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util"
123123

124124
// ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified.
125-
ArgoCDDefaultExportJobVersion = "sha256:6f80965a2bef1c80875be0995b18d9be5a6ad4af841cbc170ed3c60101a7deb2" // 0.5.0
125+
ArgoCDDefaultExportJobVersion = "sha256:823c307ea39de913e2bca0e2a7139fb3ea5b4a7462e82ad7450fd4c38b68e7e4" // 0.10.0
126126

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

‎config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: quay.io/argoprojlabs/argocd-operator
16-
newTag: v0.9.0
16+
newTag: v0.10.0

‎config/manifests/bases/argocd-operator.clusterserviceversion.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1419,5 +1419,5 @@ spec:
14191419
maturity: alpha
14201420
provider:
14211421
name: Argo CD Community
1422-
replaces: argocd-operator.v0.7.0
1423-
version: 0.8.0
1422+
replaces: argocd-operator.v0.9.1
1423+
version: 0.10.0

‎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/argoprojlabs/argocd-operator-registry@sha256:dcf6d07ed5c8b840fb4a6e9019eacd88cd0913bc3c8caa104d3414a2e9972002 # replace with your index image
7+
image: quay.io/argoprojlabs/argocd-operator-registry@sha256:3f2951534266bc986600601e4bb95812d60342b274e59e58c123f8ef2f07e68b # replace with your index image
88
displayName: Argo CD Operators
99
publisher: Argo CD Community

‎deploy/olm-catalog/argocd-operator/0.10.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
creationTimestamp: null
5+
labels:
6+
control-plane: argocd-operator
7+
name: argocd-operator-controller-manager-metrics-service
8+
spec:
9+
ports:
10+
- name: https
11+
port: 8443
12+
targetPort: 8080
13+
selector:
14+
control-plane: argocd-operator
15+
status:
16+
loadBalancer: {}

‎deploy/olm-catalog/argocd-operator/0.10.0/argocd-operator-manager-config_v1_configmap.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: v1
2+
data:
3+
controller_manager_config.yaml: |
4+
apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
5+
kind: ControllerManagerConfig
6+
health:
7+
healthProbeBindAddress: :8081
8+
metrics:
9+
bindAddress: 127.0.0.1:8080
10+
webhook:
11+
port: 9443
12+
leaderElection:
13+
leaderElect: true
14+
resourceName: b674928d.argoproj.io
15+
kind: ConfigMap
16+
metadata:
17+
name: argocd-operator-manager-config

‎deploy/olm-catalog/argocd-operator/0.10.0/argocd-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
creationTimestamp: null
5+
name: argocd-operator-metrics-reader
6+
rules:
7+
- nonResourceURLs:
8+
- /metrics
9+
verbs:
10+
- get

‎deploy/olm-catalog/argocd-operator/0.10.0/argocd-operator-webhook-service_v1_service.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
creationTimestamp: null
5+
name: argocd-operator-webhook-service
6+
spec:
7+
ports:
8+
- port: 443
9+
protocol: TCP
10+
targetPort: 9443
11+
selector:
12+
control-plane: argocd-operator
13+
status:
14+
loadBalancer: {}

‎deploy/olm-catalog/argocd-operator/0.10.0/argocd-operator.v0.10.0.clusterserviceversion.yaml

+1,996
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)