diff --git a/manifests/composite/infra/replacements/kustomization.yaml b/manifests/composite/infra/replacements/kustomization.yaml new file mode 100644 index 000000000..e563b7da7 --- /dev/null +++ b/manifests/composite/infra/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../../function/cni/calico/v3/replacements diff --git a/manifests/function/airshipctl-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-catalogues/versions-airshipctl.yaml index 60eb4f528..f17ec0f47 100644 --- a/manifests/function/airshipctl-catalogues/versions-airshipctl.yaml +++ b/manifests/function/airshipctl-catalogues/versions-airshipctl.yaml @@ -45,5 +45,20 @@ images: baremetal_operator: quay.io/metal3-io/baremetal-operator:capm3-v0.4.0 ironic_proxy: alpine/socat ironic_inspector_proxy: alpine/socat + calico_v3: + node: # calico-node DaemonSet + upgrade_ipam: calico/cni:v3.15.1 + install_cni: calico/cni:v3.15.1 + flexvol_driver: calico/pod2daemon-flexvol:v3.15.1 + calico_node: calico/node:v3.15.1 + kube_controllers: # calico-kube-controllers Deployment + calico_kube_controllers: calico/kube-controllers:v3.15.1 + hwcc: + manager: # controller-manager Deployment + manager: quay.io/hwcc/airship-hcc:v1 + kube_rbac_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 + helm_operator: + helm_operator: # helm-operator Deployment + helm_operator: docker.io/fluxcd/helm-operator:1.2.0 kubernetes: v1.18.6 diff --git a/manifests/function/cni/calico/v3/replacements/kustomization.yaml b/manifests/function/cni/calico/v3/replacements/kustomization.yaml new file mode 100644 index 000000000..1d43ee154 --- /dev/null +++ b/manifests/function/cni/calico/v3/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - versions.yaml diff --git a/manifests/function/cni/calico/v3/replacements/versions.yaml b/manifests/function/cni/calico/v3/replacements/versions.yaml new file mode 100644 index 000000000..8fb009903 --- /dev/null +++ b/manifests/function/cni/calico/v3/replacements/versions.yaml @@ -0,0 +1,56 @@ +apiVersion: airshipit.org/v1alpha1 +kind: ReplacementTransformer +metadata: + name: calico-v3-versions-replacements +replacements: +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.calico_v3.node.upgrade_ipam + target: + objref: + kind: DaemonSet + name: calico-node + fieldrefs: ["spec.template.spec.initContainers[name=upgrade-ipam].image"] +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.calico_v3.node.install_cni + target: + objref: + kind: DaemonSet + name: calico-node + fieldrefs: ["spec.template.spec.initContainers[name=install-cni].image"] +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.calico_v3.node.flexvol_driver + target: + objref: + kind: DaemonSet + name: calico-node + fieldrefs: ["spec.template.spec.initContainers[name=flexvol-driver].image"] +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.calico_v3.node.calico_node + target: + objref: + kind: DaemonSet + name: calico-node + fieldrefs: ["spec.template.spec.containers[name=calico-node].image"] +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.calico_v3.kube_controllers.calico_kube_controllers + target: + objref: + kind: Deployment + name: calico-kube-controllers + fieldrefs: ["spec.template.spec.containers[name=calico-kube-controllers].image"] + diff --git a/manifests/function/helm-operator/replacements/kustomization.yaml b/manifests/function/helm-operator/replacements/kustomization.yaml new file mode 100644 index 000000000..1d43ee154 --- /dev/null +++ b/manifests/function/helm-operator/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - versions.yaml diff --git a/manifests/function/helm-operator/replacements/versions.yaml b/manifests/function/helm-operator/replacements/versions.yaml new file mode 100644 index 000000000..ef1befc24 --- /dev/null +++ b/manifests/function/helm-operator/replacements/versions.yaml @@ -0,0 +1,16 @@ +apiVersion: airshipit.org/v1alpha1 +kind: ReplacementTransformer +metadata: + name: helm-operator-versions-replacements +replacements: +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.helm_operator.helm_operator.helm_operator + target: + objref: + kind: Deployment + name: helm-operator + fieldrefs: ["spec.template.spec.containers[name=helm-operator].image"] + diff --git a/manifests/function/hwcc/replacements/kustomization.yaml b/manifests/function/hwcc/replacements/kustomization.yaml new file mode 100644 index 000000000..1d43ee154 --- /dev/null +++ b/manifests/function/hwcc/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - versions.yaml diff --git a/manifests/function/hwcc/replacements/versions.yaml b/manifests/function/hwcc/replacements/versions.yaml new file mode 100644 index 000000000..421684e6e --- /dev/null +++ b/manifests/function/hwcc/replacements/versions.yaml @@ -0,0 +1,26 @@ +apiVersion: airshipit.org/v1alpha1 +kind: ReplacementTransformer +metadata: + name: hwcc-versions-replacements +replacements: +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.hwcc.manager.manager + target: + objref: + kind: Deployment + name: controller-manager + fieldrefs: ["spec.template.spec.containers[name=manager].image"] +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: images.hwcc.manager.kube_rbac_proxy + target: + objref: + kind: Deployment + name: controller-manager + fieldrefs: ["spec.template.spec.containers[name=kube-rbac-proxy].image"] + diff --git a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml index 2c9283cda..b8a8fe8fa 100644 --- a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml @@ -14,4 +14,5 @@ generators: - ../../../../function/airshipctl-catalogues transformers: + - ../../../../composite/infra/replacements - ../../../../function/baremetal-operator/replacements diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/test-site/target/initinfra/kustomization.yaml index cffdac288..3ede8251a 100644 --- a/manifests/site/test-site/target/initinfra/kustomization.yaml +++ b/manifests/site/test-site/target/initinfra/kustomization.yaml @@ -15,4 +15,6 @@ generators: - ../../../../function/airshipctl-catalogues transformers: + - ../../../../composite/infra/replacements - ../../../../function/baremetal-operator/replacements + - ../../../../function/helm-operator/replacements