Skip to content

Commit

Permalink
Rebase master with 0.10.0 and 0.9.1 releases (#1403)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
reginapizza authored Jun 6, 2024
1 parent e2a991b commit 22ded96
Show file tree
Hide file tree
Showing 28 changed files with 73,451 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.9.0
VERSION ?= 0.10.0

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/argocd-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/argoproj-labs/argocd-operator
support: Argo CD
name: argocd-operator.v0.9.0
name: argocd-operator.v0.10.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1889,7 +1889,7 @@ spec:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: ENABLE_CONVERSION_WEBHOOK
value: "true"
image: quay.io/argoprojlabs/argocd-operator:v0.9.0
image: quay.io/argoprojlabs/argocd-operator:v0.10.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -1979,8 +1979,8 @@ spec:
maturity: alpha
provider:
name: Argo CD Community
replaces: argocd-operator.v0.7.0
version: 0.9.0
replaces: argocd-operator.v0.9.1
version: 0.10.0
webhookdefinitions:
- admissionReviewVersions:
- v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion common/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const (
ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util"

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

// ArgoCDDefaultExportLocalCapicity is the default capacity to use for local export.
ArgoCDDefaultExportLocalCapicity = "2Gi"
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/argoprojlabs/argocd-operator
newTag: v0.9.0
newTag: v0.10.0
Original file line number Diff line number Diff line change
Expand Up @@ -1419,5 +1419,5 @@ spec:
maturity: alpha
provider:
name: Argo CD Community
replaces: argocd-operator.v0.7.0
version: 0.8.0
replaces: argocd-operator.v0.9.1
version: 0.10.0
2 changes: 1 addition & 1 deletion deploy/catalog_source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
name: argocd-catalog
spec:
sourceType: grpc
image: quay.io/argoprojlabs/argocd-operator-registry@sha256:dcf6d07ed5c8b840fb4a6e9019eacd88cd0913bc3c8caa104d3414a2e9972002 # replace with your index image
image: quay.io/argoprojlabs/argocd-operator-registry@sha256:3f2951534266bc986600601e4bb95812d60342b274e59e58c123f8ef2f07e68b # replace with your index image
displayName: Argo CD Operators
publisher: Argo CD Community
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
control-plane: argocd-operator
name: argocd-operator-controller-manager-metrics-service
spec:
ports:
- name: https
port: 8443
targetPort: 8080
selector:
control-plane: argocd-operator
status:
loadBalancer: {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
data:
controller_manager_config.yaml: |
apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
kind: ControllerManagerConfig
health:
healthProbeBindAddress: :8081
metrics:
bindAddress: 127.0.0.1:8080
webhook:
port: 9443
leaderElection:
leaderElect: true
resourceName: b674928d.argoproj.io
kind: ConfigMap
metadata:
name: argocd-operator-manager-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: argocd-operator-metrics-reader
rules:
- nonResourceURLs:
- /metrics
verbs:
- get
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
name: argocd-operator-webhook-service
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
control-plane: argocd-operator
status:
loadBalancer: {}

Large diffs are not rendered by default.

Loading

0 comments on commit 22ded96

Please sign in to comment.