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.

Sign up for GitHub

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

linting and non-functional fixes #18

Merged
merged 2 commits into from
Oct 17, 2024
Merged

linting and non-functional fixes #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bfda7b
linting and makefile fix for osx
geoberle Oct 17, 2024
c524861
use the official get-helm script
geoberle Oct 17, 2024
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
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ HELM_VERSION?=v3.14.0
helm_gen_dir:=$(dir $(HELM))


HELM_ARCHOS:=linux-amd64
HELM_ARCHOS:=$(shell uname -s | tr '[:upper:]' '[:lower:]')-$(shell uname -m)
Copy link
Collaborator

Choose a reason for hiding this comment

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

HELM_ARCHOS is used in ensure-helm to install helm, https://get.helm.sh/helm-$(HELM_VERSION)-$(HELM_ARCHOS).tar.gz
In linux env, uname -m is x86_64, but the name of helm tar is helm-v3.14.0-linux-amd64, not helm-v3.14.0-linux-x86_64.tar.gz.

ifeq ($(GOHOSTOS),darwin)
ifeq ($(GOHOSTARCH),amd64)
OPERATOR_SDK_ARCHOS:=darwin_amd64
Expand All @@ -26,19 +26,19 @@ ifeq ($(GOHOSTOS),darwin)
endif


update:
update:
hack/update.sh

install-mce: ensure-helm
$(HELM) install mce ./e2e/mce-chart
$(HELM) upgrade --install mce ./e2e/mce-chart

install-policy: ensure-helm
$(HELM) install policy ./policy
$(HELM) upgrade --install policy ./policy

e2e-install:
hack/e2e-install.sh
hack/e2e-install.sh

e2e-import-cluster:
e2e-import-cluster:
hack/e2e-import-cluster.sh

ensure-helm:
Expand Down
8 changes: 7 additions & 1 deletion policy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
apiVersion: v1
apiVersion: v2
appVersion: 2.12.0
version: 2.12.0
description: A Helm chart for ACM addons
name: policy

dependencies:
- name: grc
version: "2.12.0"
- name: cluster-lifecycle
version: "2.12.0"
2 changes: 1 addition & 1 deletion policy/charts/cluster-lifecycle/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2024 Red Hat, Inc.
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
apiVersion: v2
appVersion: 2.12.0
description: Helm chart for deploying the cluster lifecycle
kubeVersion: ">=1.11.0-0"
Expand Down
4 changes: 1 addition & 3 deletions policy/charts/grc/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# Copyright (c) 2024 Red Hat, Inc.
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
apiVersion: v2
appVersion: 2.12.0
description: A Helm chart for multicloud grc
category: "Development"
keywords:
- acm
- grc
name: grc
verified: "RHACM"
version: 2.12.0
2 changes: 1 addition & 1 deletion policy/charts/grc/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ global:
pullSecret: null
pullPolicy: Always
hubSize: Small

cma:
defaultConfig: {}

Expand Down
8 changes: 4 additions & 4 deletions policy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ global:
imageOverrides:
# upstream images
governance_policy_propagator: "quay.io/stolostron/governance-policy-propagator:2.12.0-SNAPSHOT-2024-09-30-01-46-06"
governance_policy_addon_controller: "quay.io/stolostron/governance-policy-addon-controller:2.12.0-SNAPSHOT-2024-09-30-01-46-06"
governance_policy_addon_controller: "quay.io/stolostron/governance-policy-addon-controller:2.12.0-SNAPSHOT-2024-09-30-01-46-06"
config_policy_controller: "quay.io/stolostron/config-policy-controller:2.12.0-SNAPSHOT-2024-09-30-01-46-06"
governance_policy_framework_addon: "quay.io/stolostron/governance-policy-framework-addon:2.12.0-SNAPSHOT-2024-09-30-01-46-06"
klusterlet_addon_controller: "quay.io/stolostron/klusterlet-addon-controller:2.12.0-SNAPSHOT-2024-09-30-01-46-06"

# images in ACM 2.11.2
# governance_policy_propagator: "registry.redhat.io/rhacm2/governance-policy-propagator-rhel9@sha256:af848e7e31d8ec9b5ad1896a5d5ccc67f320a7740245c190ba8a76757984e65b"
# governance_policy_addon_controller: "registry.redhat.io/rhacm2/acm-governance-policy-addon-controller-rhel9@sha256:fc0708f0a6d5266fb544f41b61d9697d370c8c5e297e4e3f13de8656f9c2b049"
# governance_policy_addon_controller: "registry.redhat.io/rhacm2/acm-governance-policy-addon-controller-rhel9@sha256:fc0708f0a6d5266fb544f41b61d9697d370c8c5e297e4e3f13de8656f9c2b049"
# config_policy_controller: "registry.redhat.io/rhacm2/config-policy-controller-rhel9@sha256:cecf914d7fb7759a4f512c1ec53a077dcb1c7e405c22a5bf6af1bf5878cf3c42"
# governance_policy_framework_addon: "registry.redhat.io/rhacm2/acm-governance-policy-framework-addon-rhel9@sha256:a4880f6e82d2b82606203ea855d0418bb29b3d4535f8bc7a9ef4074258c18674"
# klusterlet_addon_controller: "registry.redhat.io/rhacm2/klusterlet-addon-controller-rhel9@sha256:478e3e6cda0d74f43b0f05911d023344108a5cd79d57d5cc9f268ad064848a00"
namespace: multicluster-engine
pullSecret: open-cluster-management-image-pull-credentials

cma:
defaultConfig:
name: addon-hosted-config
Expand Down
Loading