Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: create release 0.12.2 #1593

Open
wants to merge 3 commits into
base: release-0.12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.12.0
VERSION ?= 0.12.2

# Try to detect Docker or Podman
CONTAINER_RUNTIME := $(shell command -v docker 2> /dev/null || command -v podman 2> /dev/null)
Expand Down
10 changes: 5 additions & 5 deletions bundle/manifests/argocd-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,13 @@ metadata:
capabilities: Deep Insights
categories: Integration & Delivery
certified: "false"
createdAt: "2024-11-06T02:57:10Z"
createdAt: "2024-11-06T05:05:40Z"
description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
operators.operatorframework.io/builder: operator-sdk-v1.35.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
repository: https://github.com/argoproj-labs/argocd-operator
support: Argo CD
name: argocd-operator.v0.12.0
name: argocd-operator.v0.12.2
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1901,7 +1901,7 @@ spec:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: ENABLE_CONVERSION_WEBHOOK
value: "true"
image: quay.io/argoprojlabs/argocd-operator:v0.12.0
image: quay.io/argoprojlabs/argocd-operator@sha256:f15781e2314d6baedcfc3bfa12181213d8d609803f73faecb2b8feddf3da4383
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like image is built for arm, should be amd64

$ docker inspect quay.io/argoprojlabs/argocd-operator@sha256:f15781e2314d6baedcfc3bfa12181213d8d609803f73faecb2b8feddf3da4383 |grep Arch
          "Architecture": "arm64",

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we build multi-arch images ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I feel we should support other archs aswell. After release automation, that is on my todo. #264 (comment)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a make command to build a multi-arch image? I did not configure any arch-type while building the image. I think it took my default laptop arch.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now, no. You need to modify image build commands and add --platform linux/amd64 flag.

diff --git a/Makefile b/Makefile
index 45c02a62..634356bb 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
        REDIS_CONFIG_PATH="build/redis" go run -ldflags=$(LD_FLAGS) ./cmd/main.go
 
 docker-build: test ## Build docker image with the manager.
-       $(CONTAINER_RUNTIME) build --build-arg LD_FLAGS=$(LD_FLAGS) -t ${IMG} .
+       $(CONTAINER_RUNTIME) build --platform linux/amd64 --build-arg LD_FLAGS=$(LD_FLAGS) -t ${IMG} .
 
 docker-push: ## Push docker image with the manager.
        $(CONTAINER_RUNTIME) push ${IMG}

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @svghadi !! Will build the image

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The image is updated on quay to be of type amd64.

livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -1991,8 +1991,8 @@ spec:
maturity: alpha
provider:
name: Argo CD Community
replaces: argocd-operator.v0.11.0
version: 0.12.0
replaces: argocd-operator.v0.12.0
version: 0.12.2
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 @@ -128,7 +128,7 @@ const (
ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util"

// ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified.
ArgoCDDefaultExportJobVersion = "sha256:43f74879ce38af1e0ce37dc159332efd282b63da3eda43e71de9cecfa45df153" // 0.12.0
ArgoCDDefaultExportJobVersion = "sha256:3082c45b2386f7751ed0c5ea5c429a5abbcee5dba8d7281c520d4203e96d97f0" // 0.12.2

// ArgoCDDefaultExportLocalCapicity is the default capacity to use for local export.
ArgoCDDefaultExportLocalCapicity = "2Gi"
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ configMapGenerator:
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
- digest: sha256:f15781e2314d6baedcfc3bfa12181213d8d609803f73faecb2b8feddf3da4383
name: controller
newName: quay.io/argoprojlabs/argocd-operator
newTag: v0.12.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.11.0
replaces: argocd-operator.v0.12.0
version: 0.12.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:72a4c53d2baaddd7c770063735e8a62a3f56bb5c0a72b4277435773f305ac376 # 0.12.0
image: quay.io/argoprojlabs/argocd-operator-registry@sha256:d30ff382a7ebfae130d0b750cbdf701c751ae0fa956ac5f3172ee9f786cdfd67 # 0.12.2
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: controller-manager
name: argocd-operator-controller-manager-metrics-service
spec:
ports:
- name: https
port: 8443
targetPort: 8080
selector:
control-plane: controller-manager
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: controller-manager
status:
loadBalancer: {}

Large diffs are not rendered by default.

Loading
Loading